X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=apps%2Fs_cb.c;h=083956916c790580b84b4d8106a2026902506900;hb=e02614417d41380c7ccc612375352aac2fab079c;hp=927f9d91e1e8c103092c4f23f94930e87f1600b5;hpb=36086186a9b90cdad0d2cd0a598a10f03f8f4bcc;p=openssl.git

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 927f9d91e1..083956916c 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -876,12 +876,12 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
 				case 16:
 					str_details1 = ", ClientKeyExchange";
 					break;
-				case 23:
-					str_details1 = ", SupplementalData";
-					break;
 				case 20:
 					str_details1 = ", Finished";
 					break;
+				case 23:
+					str_details1 = ", SupplementalData";
+					break;
 					}
 				}
 			}
@@ -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";
@@ -1680,6 +1685,12 @@ int args_ssl_call(SSL_CTX *ctx, BIO *err, SSL_CONF_CTX *cctx,
 			}
 		}
 #endif
+	if (!SSL_CONF_CTX_finish(cctx))
+		{
+		BIO_puts(err, "Error finishing context\n");
+		ERR_print_errors(err);
+		return 0;
+		}
 	return 1;
 	}