diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-03-31 12:06:30 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-03-31 12:06:30 +0000 |
| commit | 6d02d8e444f57d96465642b07233ed41801a3a75 (patch) | |
| tree | 2c7a6c0adef034edefc79282a8d87ff98eb87bab /ssl | |
| parent | 4f49cc74935d4ec9b655ea8bf888f5be0bc83bfc (diff) | |
New option "-showcerts" for s_client
Slight cleanup in ssl/
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s2_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/ssl.h | 7 | ||||
| -rw-r--r-- | ssl/ssl2.h | 4 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 33112eeb3f..d5457b0328 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -485,7 +485,7 @@ SSL *s; p=buf; /* header */ d=p+9; /* data section */ *(p++)=SSL2_MT_CLIENT_HELLO; /* type */ - s2n(SSL2_CLIENT_VERSION,p); /* version */ + s2n(SSL2_VERSION,p); /* version */ n=j=0; n=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),d); @@ -477,10 +477,9 @@ struct ssl_ctx_st struct ssl_st { - /* procol version - * 2 for SSLv2 - * 3 for SSLv3 - * -3 for SSLv3 but accept SSLv2 */ + /* protocol version + * (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION) + */ int version; int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */ diff --git a/ssl/ssl2.h b/ssl/ssl2.h index 3dc94e520b..95e8231dfc 100644 --- a/ssl/ssl2.h +++ b/ssl/ssl2.h @@ -67,8 +67,8 @@ extern "C" { #define SSL2_VERSION 0x0002 #define SSL2_VERSION_MAJOR 0x00 #define SSL2_VERSION_MINOR 0x02 -#define SSL2_CLIENT_VERSION 0x0002 -#define SSL2_SERVER_VERSION 0x0002 +/* #define SSL2_CLIENT_VERSION 0x0002 */ +/* #define SSL2_SERVER_VERSION 0x0002 */ /* Protocol Message Codes */ #define SSL2_MT_ERROR 0 diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index d731634c70..341dc63ea2 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -150,7 +150,7 @@ int session; if (session) { - if (s->version == SSL2_CLIENT_VERSION) + if (s->version == SSL2_VERSION) { ss->ssl_version=SSL2_VERSION; ss->session_id_length=SSL2_SSL_SESSION_ID_LENGTH; |