From: inoguchi <inoguchi@openbsd.org>
Date: Mon, 15 Jan 2018 11:02:07 +0000 (+0000)
Subject: Add s_server and s_client -tlsextdebug messages
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=afd7a2e156d2ba7189e2248402308c559b9e4d7b;p=openbsd

Add s_server and s_client -tlsextdebug messages

ok sthen@ jsing@
---

diff --git a/usr.bin/openssl/s_cb.c b/usr.bin/openssl/s_cb.c
index 73c4953c623..b25118c0300 100644
--- a/usr.bin/openssl/s_cb.c
+++ b/usr.bin/openssl/s_cb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_cb.c,v 1.8 2017/08/12 21:04:33 jsing Exp $ */
+/* $OpenBSD: s_cb.c,v 1.9 2018/01/15 11:02:07 inoguchi Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -732,6 +732,14 @@ tlsext_cb(SSL * s, int client_server, int type, unsigned char *data, int len,
 		extname = "renegotiation info";
 		break;
 
+	case TLSEXT_TYPE_application_layer_protocol_negotiation:
+		extname = "application layer protocol negotiation";
+		break;
+
+	case TLSEXT_TYPE_padding:
+		extname = "TLS padding";
+		break;
+
 	default:
 		extname = "unknown";
 		break;