aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/x509v3/v3_genn.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2000-09-17 20:37:33 +0000
committerRichard Levitte <levitte@openssl.org>2000-09-17 20:37:33 +0000
commitce6990739eaa9f8a4a232cdb2fa008ce08480fec (patch)
treeaf949a223309952491cd74f126fbeb13a43f1b87 /crypto/x509v3/v3_genn.c
parent42cc16030197d74058b1350052f0c3df0db0b8ce (diff)
downloadopenssl-ce6990739eaa9f8a4a232cdb2fa008ce08480fec.tar.gz
The rest of the merge in of the main trunk, a few conflicts resolved.OpenSSL-engine-0_9_6-beta2
Diffstat (limited to 'crypto/x509v3/v3_genn.c')
-rw-r--r--crypto/x509v3/v3_genn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
index 2de1c4b428..d44751458e 100644
--- a/crypto/x509v3/v3_genn.c
+++ b/crypto/x509v3/v3_genn.c
@@ -220,7 +220,7 @@ void GENERAL_NAME_free(GENERAL_NAME *a)
STACK_OF(GENERAL_NAME) *GENERAL_NAMES_new()
{
- return sk_GENERAL_NAME_new(NULL);
+ return sk_GENERAL_NAME_new_null();
}
void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *a)