From d2c786db370c7fda8d8f0f39d4c7d7591e99524f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 27 Dec 2003 16:09:59 +0000 Subject: [PATCH] Avoid including cryptlib.h, it's not really needed. Check if IDEA is being built or not. This is part of a large change submitted by Markus Friedl --- ssl/s2_clnt.c | 1 - ssl/s2_enc.c | 1 - ssl/s2_lib.c | 3 ++- ssl/s2_pkt.c | 1 - ssl/s2_srvr.c | 1 - ssl/s3_clnt.c | 1 - ssl/s3_lib.c | 2 ++ ssl/s3_srvr.c | 3 ++- ssl/ssl_asn1.c | 1 - ssl/ssl_ciph.c | 14 ++++++++++---- ssl/ssl_lib.c | 1 - ssl/ssl_sess.c | 1 - ssl/ssltest.c | 3 ++- 13 files changed, 18 insertions(+), 15 deletions(-) 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 #include #include -#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 -#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 #include #include -#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 #include -#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 #include #include -#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 91bc095fe7..26ce0cb963 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -117,7 +117,6 @@ #include #include #include -#include "cryptlib.h" static SSL_METHOD *ssl3_get_client_method(int ver); static int ssl3_client_hello(SSL *s); 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 881f68b998..57f1d3f52a 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -121,9 +121,10 @@ #include #include #include +#ifndef OPENSSL_NO_KRB5 #include +#endif #include -#include "cryptlib.h" static SSL_METHOD *ssl3_get_server_method(int ver); static int ssl3_get_client_hello(SSL *s); 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 #include #include -#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 6d69890688..ee9a82d586 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -121,7 +121,6 @@ #include #include #include -#include "cryptlib.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 #include #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); diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 28095148e7..7e76c2381a 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -119,6 +119,7 @@ #include #include #include +#include #define USE_SOCKETS #include "e_os.h" @@ -1508,7 +1509,7 @@ static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg) fprintf(stderr, "In app_verify_callback, allowing cert. "); fprintf(stderr, "Arg is: %s\n", (char *)arg); fprintf(stderr, "Finished printing do we have a context? 0x%x a cert? 0x%x\n", - (unsigned int)ctx, (unsigned int)ctx->cert); + (uintptr_t)ctx, (uintptr_t)ctx->cert); if (ctx->cert) s=X509_NAME_oneline(X509_get_subject_name(ctx->cert),buf,256); if (s != NULL)