[BACK]Return to s_server.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/s_server.c between version 1.12 and 1.13

version 1.12, 2015/07/17 07:04:41 version 1.13, 2015/07/17 16:09:46
Line 310 
Line 310 
         BIO_printf(bio_err, " -cipher arg   - play with 'openssl ciphers' to see what goes here\n");          BIO_printf(bio_err, " -cipher arg   - play with 'openssl ciphers' to see what goes here\n");
         BIO_printf(bio_err, " -serverpref   - Use server's cipher preferences\n");          BIO_printf(bio_err, " -serverpref   - Use server's cipher preferences\n");
         BIO_printf(bio_err, " -quiet        - Inhibit printing of session and certificate information\n");          BIO_printf(bio_err, " -quiet        - Inhibit printing of session and certificate information\n");
         BIO_printf(bio_err, " -ssl3         - Just talk SSLv3\n");  
         BIO_printf(bio_err, " -tls1_2       - Just talk TLSv1.2\n");          BIO_printf(bio_err, " -tls1_2       - Just talk TLSv1.2\n");
         BIO_printf(bio_err, " -tls1_1       - Just talk TLSv1.1\n");          BIO_printf(bio_err, " -tls1_1       - Just talk TLSv1.1\n");
         BIO_printf(bio_err, " -tls1         - Just talk TLSv1\n");          BIO_printf(bio_err, " -tls1         - Just talk TLSv1\n");
Line 806 
Line 805 
                         off |= SSL_OP_NO_TLSv1_2;                          off |= SSL_OP_NO_TLSv1_2;
                 } else if (strcmp(*argv, "-no_comp") == 0) {                  } else if (strcmp(*argv, "-no_comp") == 0) {
                         off |= SSL_OP_NO_COMPRESSION;                          off |= SSL_OP_NO_COMPRESSION;
                 }                  } else if (strcmp(*argv, "-no_ticket") == 0) {
                 else if (strcmp(*argv, "-no_ticket") == 0) {  
                         off |= SSL_OP_NO_TICKET;                          off |= SSL_OP_NO_TICKET;
                 }  
                 else if (strcmp(*argv, "-ssl3") == 0) {  
                         meth = SSLv3_server_method();  
                 } else if (strcmp(*argv, "-tls1") == 0) {                  } else if (strcmp(*argv, "-tls1") == 0) {
                         meth = TLSv1_server_method();                          meth = TLSv1_server_method();
                 } else if (strcmp(*argv, "-tls1_1") == 0) {                  } else if (strcmp(*argv, "-tls1_1") == 0) {
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13