32ec41539b
This commit changes the way that we do server side protocol version negotiation. Previously we had a whole set of code that had an "up front" state machine dedicated to the negotiating the protocol version. This adds significant complexity to the state machine. Historically the justification for doing this was the support of SSLv2 which works quite differently to SSLv3+. However, we have now removed support for SSLv2 so there is little reason to maintain this complexity. The one slight difficulty is that, although we no longer support SSLv2, we do still support an SSLv3+ ClientHello in an SSLv2 backward compatible ClientHello format. This is generally only used by legacy clients. This commit adds support within the SSLv3 code for these legacy format ClientHellos. Server side version negotiation now works in much the same was as DTLS, i.e. we introduce the concept of TLS_ANY_VERSION. If s->version is set to that then when a ClientHello is received it will work out the most appropriate version to respond with. Also, SSLv23_method and SSLv23_server_method have been replaced with TLS_method and TLS_server_method respectively. The old SSLv23* names still exist as macros pointing at the new name, although they are deprecated. Subsequent commits will look at client side version negotiation, as well of removal of the old s23* code. Reviewed-by: Kurt Roeckx <kurt@openssl.org>
223 lines
7.4 KiB
C
223 lines
7.4 KiB
C
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
* All rights reserved.
|
|
*
|
|
* This package is an SSL implementation written
|
|
* by Eric Young (eay@cryptsoft.com).
|
|
* The implementation was written so as to conform with Netscapes SSL.
|
|
*
|
|
* This library is free for commercial and non-commercial use as long as
|
|
* the following conditions are aheared to. The following conditions
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
* included with this distribution is covered by the same copyright terms
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
|
*
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
* the code are not to be removed.
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
* as the author of the parts of the library used.
|
|
* This can be in the form of a textual message at program startup or
|
|
* in documentation (online or textual) provided with the package.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* "This product includes cryptographic software written by
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
* being used are not cryptographic related :-).
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* The licence and distribution terms for any publically available version or
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
* copied and put under another distribution licence
|
|
* [including the GNU Public Licence.]
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "apps.h"
|
|
#include <openssl/err.h>
|
|
#include <openssl/ssl.h>
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
#ifndef OPENSSL_NO_SSL_TRACE
|
|
OPT_STDNAME,
|
|
#endif
|
|
#ifndef OPENSSL_NO_SSL3
|
|
OPT_SSL3,
|
|
#endif
|
|
OPT_TLS1,
|
|
OPT_V, OPT_UPPER_V, OPT_S
|
|
} OPTION_CHOICE;
|
|
|
|
OPTIONS ciphers_options[] = {
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
{"v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers"},
|
|
{"V", OPT_UPPER_V, '-', "Even more verbose"},
|
|
{"s", OPT_S, '-', "Only supported ciphers"},
|
|
#ifndef OPENSSL_NO_SSL_TRACE
|
|
{"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
|
|
#endif
|
|
#ifndef OPENSSL_NO_SSL3
|
|
{"ssl3", OPT_SSL3, '-', "SSL3 mode"},
|
|
#endif
|
|
{"tls1", OPT_TLS1, '-', "TLS1 mode"},
|
|
{NULL}
|
|
};
|
|
|
|
int ciphers_main(int argc, char **argv)
|
|
{
|
|
SSL_CTX *ctx = NULL;
|
|
SSL *ssl = NULL;
|
|
STACK_OF(SSL_CIPHER) *sk = NULL;
|
|
const SSL_METHOD *meth = TLS_server_method();
|
|
int ret = 1, i, verbose = 0, Verbose = 0, use_supported = 0;
|
|
#ifndef OPENSSL_NO_SSL_TRACE
|
|
int stdname = 0;
|
|
#endif
|
|
const char *p;
|
|
char *ciphers = NULL, *prog;
|
|
char buf[512];
|
|
OPTION_CHOICE o;
|
|
|
|
prog = opt_init(argc, argv, ciphers_options);
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
switch (o) {
|
|
case OPT_EOF:
|
|
case OPT_ERR:
|
|
opthelp:
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
goto end;
|
|
case OPT_HELP:
|
|
opt_help(ciphers_options);
|
|
ret = 0;
|
|
goto end;
|
|
case OPT_V:
|
|
verbose = 1;
|
|
break;
|
|
case OPT_UPPER_V:
|
|
verbose = Verbose = 1;
|
|
break;
|
|
case OPT_S:
|
|
use_supported = 1;
|
|
break;
|
|
#ifndef OPENSSL_NO_SSL_TRACE
|
|
case OPT_STDNAME:
|
|
stdname = verbose = 1;
|
|
break;
|
|
#endif
|
|
#ifndef OPENSSL_NO_SSL3
|
|
case OPT_SSL3:
|
|
meth = SSLv3_client_method();
|
|
break;
|
|
#endif
|
|
case OPT_TLS1:
|
|
meth = TLSv1_client_method();
|
|
break;
|
|
}
|
|
}
|
|
argv = opt_rest();
|
|
argc = opt_num_rest();
|
|
|
|
if (argc == 1)
|
|
ciphers = *argv;
|
|
else if (argc != 0)
|
|
goto opthelp;
|
|
|
|
ctx = SSL_CTX_new(meth);
|
|
if (ctx == NULL)
|
|
goto err;
|
|
if (ciphers != NULL) {
|
|
if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
|
|
BIO_printf(bio_err, "Error in cipher list\n");
|
|
goto err;
|
|
}
|
|
}
|
|
ssl = SSL_new(ctx);
|
|
if (ssl == NULL)
|
|
goto err;
|
|
|
|
if (use_supported)
|
|
sk = SSL_get1_supported_ciphers(ssl);
|
|
else
|
|
sk = SSL_get_ciphers(ssl);
|
|
|
|
if (!verbose) {
|
|
for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
|
|
SSL_CIPHER *c = sk_SSL_CIPHER_value(sk, i);
|
|
p = SSL_CIPHER_get_name(c);
|
|
if (p == NULL)
|
|
break;
|
|
if (i != 0)
|
|
BIO_printf(bio_out, ":");
|
|
BIO_printf(bio_out, "%s", p);
|
|
}
|
|
BIO_printf(bio_out, "\n");
|
|
} else {
|
|
|
|
for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
|
|
SSL_CIPHER *c;
|
|
|
|
c = sk_SSL_CIPHER_value(sk, i);
|
|
|
|
if (Verbose) {
|
|
unsigned long id = SSL_CIPHER_get_id(c);
|
|
int id0 = (int)(id >> 24);
|
|
int id1 = (int)((id >> 16) & 0xffL);
|
|
int id2 = (int)((id >> 8) & 0xffL);
|
|
int id3 = (int)(id & 0xffL);
|
|
|
|
if ((id & 0xff000000L) == 0x03000000L)
|
|
BIO_printf(bio_out, " 0x%02X,0x%02X - ", id2, id3); /* SSL3
|
|
* cipher */
|
|
else
|
|
BIO_printf(bio_out, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
|
|
}
|
|
#ifndef OPENSSL_NO_SSL_TRACE
|
|
if (stdname) {
|
|
const char *nm = SSL_CIPHER_standard_name(c);
|
|
if (nm == NULL)
|
|
nm = "UNKNOWN";
|
|
BIO_printf(bio_out, "%s - ", nm);
|
|
}
|
|
#endif
|
|
BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof buf));
|
|
}
|
|
}
|
|
|
|
ret = 0;
|
|
goto end;
|
|
err:
|
|
ERR_print_errors(bio_err);
|
|
end:
|
|
if (use_supported)
|
|
sk_SSL_CIPHER_free(sk);
|
|
SSL_CTX_free(ctx);
|
|
SSL_free(ssl);
|
|
return (ret);
|
|
}
|