From acbaebc6cff388f806f67cb2ca1b90564bf1ce82 Mon Sep 17 00:00:00 2001
From: inoguchi <>
Date: Mon, 15 Jan 2018 11:02:07 +0000
Subject: Add s_server and s_client -tlsextdebug messages

ok sthen@ jsing@
---
 src/usr.bin/openssl/s_cb.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/usr.bin/openssl/s_cb.c')

diff --git a/src/usr.bin/openssl/s_cb.c b/src/usr.bin/openssl/s_cb.c
index 73c4953c62..b25118c030 100644
--- a/src/usr.bin/openssl/s_cb.c
+++ b/src/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;
-- 
cgit v1.2.3-55-g6feb