From: Dr. Stephen Henson Date: Sun, 1 Jun 2014 15:25:43 +0000 (+0100) Subject: Recognise padding extension. X-Git-Tag: OpenSSL_1_0_2-beta2~180 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d7157414279fa2478fa0ddb160a77b8c2f2e4ce;p=oweals%2Fopenssl.git Recognise padding extension. (cherry picked from commit ea2bb861f0daaa20819bf9ac8c146f7593feacd4) Conflicts: apps/s_cb.c --- diff --git a/apps/s_cb.c b/apps/s_cb.c index 0f21838cdb..b20d632b11 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -1025,6 +1025,10 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type, break; #endif + case TLSEXT_TYPE_padding: + extname = "TLS padding"; + break; + default: extname = "unknown"; break;