X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=ssl%2Fs2_enc.c;h=c05ce5ddc0921b6cd7a4ef6d7f6f81037d0583c1;hb=09a2615fb24237d7586777d53b720c0df69932d1;hp=09835008a99d9fd7fbc53964bc4912d212f1e21e;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=openssl.git diff --git a/ssl/s2_enc.c b/ssl/s2_enc.c index 09835008a9..c05ce5ddc0 100644 --- a/ssl/s2_enc.c +++ b/ssl/s2_enc.c @@ -56,8 +56,9 @@ * [including the GNU Public Licence.] */ -#include #include "ssl_locl.h" +#ifndef OPENSSL_NO_SSL2 +#include int ssl2_enc_init(SSL *s, int client) { @@ -79,11 +80,11 @@ int ssl2_enc_init(SSL *s, int client) if ((s->enc_read_ctx == NULL) && ((s->enc_read_ctx=(EVP_CIPHER_CTX *) - Malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) + OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) goto err; if ((s->enc_write_ctx == NULL) && ((s->enc_write_ctx=(EVP_CIPHER_CTX *) - Malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) + OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) goto err; rs= s->enc_read_ctx; @@ -177,4 +178,10 @@ void ssl2_mac(SSL *s, unsigned char *md, int send) EVP_DigestFinal(&c,md,NULL); /* some would say I should zero the md context */ } +#else /* !OPENSSL_NO_SSL2 */ + +# if PEDANTIC +static void *dummy=&dummy; +# endif +#endif