From e25eb309ec5e4c66542a49d29f6f097d81bda88b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 26 Dec 2006 21:23:38 +0000 Subject: [PATCH] From HEAD --- crypto/crypto-lib.com | 3 ++- crypto/x509v3/v3_addr.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index 13b206dc52..5d5a37ecf4 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -209,7 +209,8 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ - "tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ - "tb_cipher,tb_digest,"+ - "eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,eng_padlock" -$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr" +$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,"+ - + "aes_ctr,aes_ige" $ LIB_BUFFER = "buffer,buf_err" $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - "bss_mem,bss_null,bss_fd,"+ - diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c index 0e397d4447..f3c739fdde 100644 --- a/crypto/x509v3/v3_addr.c +++ b/crypto/x509v3/v3_addr.c @@ -66,6 +66,7 @@ #include #include #include +#include #include #ifndef OPENSSL_NO_RFC3779 @@ -935,7 +936,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method, length = length_from_afi(afi); /* - * Handle SAFI, if any, and strdup() so we can null-terminate + * Handle SAFI, if any, and BUF_strdup() so we can null-terminate * the other input values. */ if (safi != NULL) { @@ -947,9 +948,9 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method, goto err; } t += strspn(t, " \t"); - s = strdup(t); + s = BUF_strdup(t); } else { - s = strdup(val->value); + s = BUF_strdup(val->value); } if (s == NULL) { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE); -- 2.50.1