diff options
| author | Ulf Möller <ulf@openssl.org> | 2000-02-24 05:41:03 +0100 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 2000-02-24 05:41:03 +0100 |
| commit | 4c5fac4ac4352f4487f2b8cd4660b40bdd0b8f86 (patch) | |
| tree | f2149d93f7e251c52c44d45f3f7eb90d1ae7cd97 /ssl | |
| parent | EGD info, as requested. (diff) | |
| download | openssl-4c5fac4ac4352f4487f2b8cd4660b40bdd0b8f86.tar.xz openssl-4c5fac4ac4352f4487f2b8cd4660b40bdd0b8f86.zip | |
Fix NO_RSA (misplaced #endif).
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s23_srvr.c | 5 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 5b38f9e285..6a3bbb10b9 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -206,8 +206,11 @@ int ssl23_get_client_hello(SSL *s) unsigned int i; unsigned int csl,sil,cl; int n=0,j; - int type=0,use_sslv2_strong=0; + int type=0; int v[2]; +#ifndef NO_RSA + int use_sslv2_strong=0; +#endif if (s->state == SSL23_ST_SR_CLNT_HELLO_A) { diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 2a9e115e9c..7c6993643f 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1326,7 +1326,6 @@ static int ssl3_get_client_key_exchange(SSL *s) SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER); goto f_err; } -#endif s->session->master_key_length= s->method->ssl3_enc->generate_master_secret(s, @@ -1335,6 +1334,7 @@ static int ssl3_get_client_key_exchange(SSL *s) memset(p,0,i); } else +#endif #ifndef NO_DH if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) { diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 5af71b5545..3e52a8bce1 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -81,11 +81,13 @@ OPENSSL_GLOBAL SSL3_ENC_METHOD ssl3_undef_enc_method={ (int (*)(SSL *, EVP_MD_CTX *, EVP_MD_CTX *, const char*, int, unsigned char *))ssl_undefined_function }; +#ifndef NO_RSA union rsa_fn_to_char_u { char *char_p; RSA *(*fn_p)(SSL *, int, int); }; +#endif union dh_fn_to_char_u { |