summaryrefslogtreecommitdiffstats
path: root/ssl/s3_cbc.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-09-06 13:44:08 +1000
committerPauli <paul.dale@oracle.com>2020-09-09 17:59:08 +1000
commitb924d1b6e1b66def84979dbbf3c79059cff1d554 (patch)
treeaf5a817fcfe0bd501eadd929be8c1ed09fca3265 /ssl/s3_cbc.c
parent81661a14bcf9fb92eadedb15de75c3eb5b4e97a8 (diff)
TLS: remove legacy code path supporting special CBC mode
Reviewed-by: Ben Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/11961)
Diffstat (limited to 'ssl/s3_cbc.c')
-rw-r--r--ssl/s3_cbc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index 4895f43568..59e4178636 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -31,6 +31,7 @@
#include <openssl/sha.h>
char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
int ssl3_cbc_digest_record(const EVP_MD *md,
unsigned char *md_out,
size_t *md_out_size,
@@ -128,6 +129,7 @@ static void tls1_sha512_final_raw(void *ctx, unsigned char *md_out)
l2n8(sha512->h[i], md_out);
}
}
+#endif
#undef LARGEST_DIGEST_CTX
#define LARGEST_DIGEST_CTX SHA512_CTX
@@ -151,6 +153,7 @@ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx)
}
}
+#ifndef OPENSSL_NO_DEPRECATED_3_0
/*-
* ssl3_cbc_digest_record computes the MAC of a decrypted, padded SSLv3/TLS
* record.
@@ -523,3 +526,4 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
EVP_MD_CTX_free(md_ctx);
return ret;
}
+#endif