From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 1 Jun 2014 15:25:43 +0000 (+0100)
Subject: Recognise padding extension.
X-Git-Tag: OpenSSL_1_0_1h~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19ce768c6b462516c07d839a53990ab9d0219485;p=oweals%2Fopenssl.git

Recognise padding extension.
(cherry picked from commit ea2bb861f0daaa20819bf9ac8c146f7593feacd4)

Conflicts:

	apps/s_cb.c
(cherry picked from commit 14dc83ca779e91a267701a1fb05b2bbcf2cb63c4)
---

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 84c3b447c2..146a960795 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -747,6 +747,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;