[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  fecd04e9104bc4216297ec3756783ef27348280c (commit)
       via  5573ee366900ba94959b5d66606ed352c80340db (commit)
      from  85a7007c38dc2bd4e5052c0daf5279871c01d727 (commit)


- Log -----------------------------------------------------------------
commit fecd04e9104bc4216297ec3756783ef27348280c
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Thu Sep 17 13:33:40 2015 +0200

    Print debug info for extended master secret extension
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 5573ee366900ba94959b5d66606ed352c80340db
Author: Michal Bozon <michal.bozon at gmail.com>
Date:   Mon Sep 28 12:59:27 2015 -0400

    RT4053: Typo in error message
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/prime.c | 2 +-
 apps/s_cb.c  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/prime.c b/apps/prime.c
index d7f3869..2ce4e94 100644
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -121,7 +121,7 @@ int prime_main(int argc, char **argv)
         char *s;
 
         if (!bits) {
-            BIO_printf(bio_err, "Specifiy the number of bits.\n");
+            BIO_printf(bio_err, "Specify the number of bits.\n");
             goto end;
         }
         bn = BN_new();
diff --git a/apps/s_cb.c b/apps/s_cb.c
index f4559fa..643d91a 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -715,6 +715,9 @@ static STRINT_PAIR tlsext_types[] = {
     {"application layer protocol negotiation",
      TLSEXT_TYPE_application_layer_protocol_negotiation},
 #endif
+#ifdef TLSEXT_TYPE_extended_master_secret
+    {"extended master secret", TLSEXT_TYPE_extended_master_secret},
+#endif
     {NULL}
 };