[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  ccc227565da59c4d6c707925c4230ab2afa2cf87 (commit)
      from  2f8d82d6418c4de8330e2870c1ca6386dc9e1b34 (commit)


- Log -----------------------------------------------------------------
commit ccc227565da59c4d6c707925c4230ab2afa2cf87
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Feb 24 02:27:51 2015 +0000

    Don't set no_protocol if -tls1 selected.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 ssl/ssltest.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index fb51ddd..89fb44a 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1130,7 +1130,6 @@ int main(int argc, char *argv[])
         }
 #endif
         else if (strcmp(*argv, "-tls1") == 0) {
-            no_protocol = 1;
             tls1 = 1;
         } else if (strcmp(*argv, "-ssl3") == 0) {
 #ifdef OPENSSL_NO_SSL3_METHOD