summaryrefslogtreecommitdiffstats
path: root/ssl/s2_srvr.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-03-22 17:12:33 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-09-08 13:14:03 +0100
commit5e3ff62c345c976cd1ffbcc5e6042f55264977f5 (patch)
tree16c9ffcc2468e21f5ee445e440c835857ed94c81 /ssl/s2_srvr.c
parent226751ae4a1f3e00021c43399d7bb51a99c22c17 (diff)
Experimental encrypt-then-mac support.
Experimental support for encrypt then mac from draft-gutmann-tls-encrypt-then-mac-02.txt To enable it set the appropriate extension number (0x10 for the test server) using e.g. -DTLSEXT_TYPE_encrypt_then_mac=0x10 For non-compliant peers (i.e. just about everything) this should have no effect.
Diffstat (limited to 'ssl/s2_srvr.c')
-rw-r--r--ssl/s2_srvr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index 2cba426bb7..a16c33a65f 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -452,7 +452,7 @@ static int get_client_master_key(SSL *s)
is_export=SSL_C_IS_EXPORT(s->session->cipher);
- if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL,NULL))
+ if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL,NULL, 0))
{
ssl2_return_error(s,SSL2_PE_NO_CIPHER);
SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);