summaryrefslogtreecommitdiffstats
path: root/apps/s_cb.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 /apps/s_cb.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 'apps/s_cb.c')
-rw-r--r--apps/s_cb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c
index 8127e77143..b1102ceed6 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -1023,6 +1023,11 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
extname = "next protocol";
break;
#endif
+#ifdef TLSEXT_TYPE_encrypt_then_mac
+ case TLSEXT_TYPE_encrypt_then_mac:
+ extname = "encrypt-then-mac";
+ break;
+#endif
default:
extname = "unknown";