diff options
author | Richard Levitte <levitte@openssl.org> | 2004-01-19 08:53:02 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2004-01-19 08:53:02 +0000 |
commit | 8b79f2051d831eb7cb51205b27661d43e3cf3f5e (patch) | |
tree | fca871353fec9cdc5c0c644580a7007d1f67ca26 /ssl | |
parent | 799562704032021e111a998c0a2e286e7b405a28 (diff) |
Recent and not so recent changes from 0.9.7-stable, all conflicts resolved.
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/Makefile.ssl | 2 | ||||
-rw-r--r-- | ssl/s2_clnt.c | 1 | ||||
-rw-r--r-- | ssl/s2_enc.c | 1 | ||||
-rw-r--r-- | ssl/s2_lib.c | 3 | ||||
-rw-r--r-- | ssl/s2_pkt.c | 1 | ||||
-rw-r--r-- | ssl/s2_srvr.c | 1 | ||||
-rw-r--r-- | ssl/s3_clnt.c | 1 | ||||
-rw-r--r-- | ssl/s3_enc.c | 12 | ||||
-rw-r--r-- | ssl/s3_lib.c | 2 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 3 | ||||
-rw-r--r-- | ssl/ssl_asn1.c | 1 | ||||
-rw-r--r-- | ssl/ssl_ciph.c | 14 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 1 | ||||
-rw-r--r-- | ssl/ssl_sess.c | 1 |
14 files changed, 23 insertions, 21 deletions
diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index e7b2a2947f..3364c97c55 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -71,7 +71,7 @@ files: $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile + @sh $(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 1d24dedc91..43b32eb415 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -116,7 +116,6 @@ #include <openssl/buffer.h> #include <openssl/objects.h> #include <openssl/evp.h> -#include "cryptlib.h" static SSL_METHOD *ssl2_get_client_method(int ver); static int get_server_finished(SSL *s); diff --git a/ssl/s2_enc.c b/ssl/s2_enc.c index d3b144f1c5..21a06f76cb 100644 --- a/ssl/s2_enc.c +++ b/ssl/s2_enc.c @@ -59,7 +59,6 @@ #include "ssl_locl.h" #ifndef OPENSSL_NO_SSL2 #include <stdio.h> -#include "cryptlib.h" int ssl2_enc_init(SSL *s, int client) { diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index 910b9fe097..edcef4dda2 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -63,7 +63,6 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/md5.h> -#include "cryptlib.h" static long ssl2_default_timeout(void ); const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT; @@ -139,6 +138,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={ SSL_ALL_STRENGTHS, }, /* IDEA_128_CBC_WITH_MD5 */ +#ifndef OPENSSL_NO_IDEA { 1, SSL2_TXT_IDEA_128_CBC_WITH_MD5, @@ -151,6 +151,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={ SSL_ALL_CIPHERS, SSL_ALL_STRENGTHS, }, +#endif /* DES_64_CBC_WITH_MD5 */ { 1, diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c index d82f137613..a10929a757 100644 --- a/ssl/s2_pkt.c +++ b/ssl/s2_pkt.c @@ -113,7 +113,6 @@ #ifndef OPENSSL_NO_SSL2 #include <stdio.h> #include <errno.h> -#include "cryptlib.h" #define USE_SOCKETS static int read_n(SSL *s,unsigned int n,unsigned int max,unsigned int extend); diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index 62859a2d95..5da2a54af3 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -116,7 +116,6 @@ #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> -#include "cryptlib.h" static SSL_METHOD *ssl2_get_server_method(int ver); static int get_client_master_key(SSL *s); diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 1316dacfe2..811ed72d4b 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -117,7 +117,6 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/md5.h> -#include "cryptlib.h" #include "../fips/fips_locl.h" static SSL_METHOD *ssl3_get_client_method(int ver); diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 559924d368..92efb9597d 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -199,10 +199,10 @@ int ssl3_change_cipher_state(SSL *s, int which) COMP_METHOD *comp; const EVP_MD *m; EVP_MD_CTX md; - int exp,n,i,j,k,cl; + int is_exp,n,i,j,k,cl; int reuse_dd = 0; - exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher); + is_exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher); c=s->s3->tmp.new_sym_enc; m=s->s3->tmp.new_hash; if (s->s3->tmp.new_compression == NULL) @@ -276,9 +276,9 @@ int ssl3_change_cipher_state(SSL *s, int which) p=s->s3->tmp.key_block; i=EVP_MD_size(m); cl=EVP_CIPHER_key_length(c); - j=exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ? - cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl; - /* Was j=(exp)?5:EVP_CIPHER_key_length(c); */ + j=is_exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ? + cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl; + /* Was j=(is_exp)?5:EVP_CIPHER_key_length(c); */ k=EVP_CIPHER_iv_length(c); if ( (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) || (which == SSL3_CHANGE_CIPHER_SERVER_READ)) @@ -307,7 +307,7 @@ int ssl3_change_cipher_state(SSL *s, int which) EVP_MD_CTX_init(&md); memcpy(mac_secret,ms,i); - if (exp) + if (is_exp) { /* In here I set both the read and write key/iv to the * same value since only the correct one will be used :-). diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 896b12fc4f..d04096016c 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -271,6 +271,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ SSL_ALL_STRENGTHS, }, /* Cipher 07 */ +#ifndef OPENSSL_NO_IDEA { 1, SSL3_TXT_RSA_IDEA_128_SHA, @@ -283,6 +284,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ SSL_ALL_CIPHERS, SSL_ALL_STRENGTHS, }, +#endif /* Cipher 08 */ { 1, diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index f3869e590e..79278680c6 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -121,9 +121,10 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_KRB5 #include <openssl/krb5_asn.h> +#endif #include <openssl/md5.h> -#include "cryptlib.h" #include "../fips/fips_locl.h" static SSL_METHOD *ssl3_get_server_method(int ver); diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index 16bc11b559..d8ff8fc4a3 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -62,7 +62,6 @@ #include <openssl/asn1_mac.h> #include <openssl/objects.h> #include <openssl/x509.h> -#include "cryptlib.h" typedef struct ssl_session_asn1_st { diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 8fc0d3e1b8..44c503eb04 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -125,7 +125,9 @@ static const SSL_CIPHER cipher_aliases[]={ {0,SSL_TXT_3DES,0,SSL_3DES, 0,0,0,0,SSL_ENC_MASK,0}, {0,SSL_TXT_RC4, 0,SSL_RC4, 0,0,0,0,SSL_ENC_MASK,0}, {0,SSL_TXT_RC2, 0,SSL_RC2, 0,0,0,0,SSL_ENC_MASK,0}, +#ifndef OPENSSL_NO_IDEA {0,SSL_TXT_IDEA,0,SSL_IDEA, 0,0,0,0,SSL_ENC_MASK,0}, +#endif {0,SSL_TXT_eNULL,0,SSL_eNULL,0,0,0,0,SSL_ENC_MASK,0}, {0,SSL_TXT_eFZA,0,SSL_eFZA, 0,0,0,0,SSL_ENC_MASK,0}, {0,SSL_TXT_AES, 0,SSL_AES, 0,0,0,0,SSL_ENC_MASK,0}, @@ -166,8 +168,12 @@ static void load_ciphers(void) EVP_get_cipherbyname(SN_rc4); ssl_cipher_methods[SSL_ENC_RC2_IDX]= EVP_get_cipherbyname(SN_rc2_cbc); +#ifndef OPENSSL_NO_IDEA ssl_cipher_methods[SSL_ENC_IDEA_IDX]= EVP_get_cipherbyname(SN_idea_cbc); +#else + ssl_cipher_methods[SSL_ENC_IDEA_IDX]= NULL; +#endif ssl_cipher_methods[SSL_ENC_AES128_IDX]= EVP_get_cipherbyname(SN_aes_128_cbc); ssl_cipher_methods[SSL_ENC_AES256_IDX]= @@ -906,7 +912,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) { int is_export,pkl,kl; - char *ver,*exp; + char *ver,*exp_str; char *kx,*au,*enc,*mac; unsigned long alg,alg2,alg_s; #ifdef KSSL_DEBUG @@ -922,7 +928,7 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) is_export=SSL_C_IS_EXPORT(cipher); pkl=SSL_C_EXPORT_PKEYLENGTH(cipher); kl=SSL_C_EXPORT_KEYLENGTH(cipher); - exp=is_export?" export":""; + exp_str=is_export?" export":""; if (alg & SSL_SSLV2) ver="SSLv2"; @@ -1041,9 +1047,9 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) return("Buffer too small"); #ifdef KSSL_DEBUG - BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp,alg); + BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp_str,alg); #else - BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp); + BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp_str); #endif /* KSSL_DEBUG */ return(buf); } diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 3e0e703019..5887e62168 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -121,7 +121,6 @@ #include <openssl/objects.h> #include <openssl/lhash.h> #include <openssl/x509v3.h> -#include "cryptlib.h" #include "../fips/fips_locl.h" const char *SSL_version_str=OPENSSL_VERSION_TEXT; diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index fabcdefa6e..7016c87d3b 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -60,7 +60,6 @@ #include <openssl/lhash.h> #include <openssl/rand.h> #include "ssl_locl.h" -#include "cryptlib.h" static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s); static void SSL_SESSION_list_add(SSL_CTX *ctx,SSL_SESSION *s); |