From HEAD
This commit is contained in:
parent
ffa2b2aa7d
commit
e25eb309ec
@ -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_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -
|
||||||
"tb_cipher,tb_digest,"+ -
|
"tb_cipher,tb_digest,"+ -
|
||||||
"eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,eng_padlock"
|
"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_BUFFER = "buffer,buf_err"
|
||||||
$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
|
$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
|
||||||
"bss_mem,bss_null,bss_fd,"+ -
|
"bss_mem,bss_null,bss_fd,"+ -
|
||||||
|
@ -66,6 +66,7 @@
|
|||||||
#include <openssl/conf.h>
|
#include <openssl/conf.h>
|
||||||
#include <openssl/asn1.h>
|
#include <openssl/asn1.h>
|
||||||
#include <openssl/asn1t.h>
|
#include <openssl/asn1t.h>
|
||||||
|
#include <openssl/buffer.h>
|
||||||
#include <openssl/x509v3.h>
|
#include <openssl/x509v3.h>
|
||||||
|
|
||||||
#ifndef OPENSSL_NO_RFC3779
|
#ifndef OPENSSL_NO_RFC3779
|
||||||
@ -935,7 +936,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
|
|||||||
length = length_from_afi(afi);
|
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.
|
* the other input values.
|
||||||
*/
|
*/
|
||||||
if (safi != NULL) {
|
if (safi != NULL) {
|
||||||
@ -947,9 +948,9 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
|
|||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
t += strspn(t, " \t");
|
t += strspn(t, " \t");
|
||||||
s = strdup(t);
|
s = BUF_strdup(t);
|
||||||
} else {
|
} else {
|
||||||
s = strdup(val->value);
|
s = BUF_strdup(val->value);
|
||||||
}
|
}
|
||||||
if (s == NULL) {
|
if (s == NULL) {
|
||||||
X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
|
X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user