diff options
author | Richard Levitte <levitte@openssl.org> | 2000-09-18 00:37:33 +0400 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2000-09-18 00:37:33 +0400 |
commit | ce6990739eaa9f8a4a232cdb2fa008ce08480fec (patch) | |
tree | af949a223309952491cd74f126fbeb13a43f1b87 /ssl | |
parent | 42cc16030197d74058b1350052f0c3df0db0b8ce (diff) |
The rest of the merge in of the main trunk, a few conflicts resolved.OpenSSL-engine-0_9_6-beta2
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/ssl_cert.c | 2 | ||||
-rw-r--r-- | ssl/ssl_ciph.c | 2 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 7579a3432d..c26df62c20 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -589,7 +589,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) X509_NAME *xn=NULL; STACK_OF(X509_NAME) *ret,*sk; - ret=sk_X509_NAME_new(NULL); + ret=sk_X509_NAME_new_null(); sk=sk_X509_NAME_new(xname_cmp); in=BIO_new(BIO_s_file_internal()); diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index ce73213b12..f63163f26c 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -799,7 +799,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, * Allocate new "cipherstack" for the result, return with error * if we cannot get one. */ - if ((cipherstack = sk_SSL_CIPHER_new(NULL)) == NULL) + if ((cipherstack = sk_SSL_CIPHER_new_null()) == NULL) { OPENSSL_free(list); return(NULL); diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 1483fad19a..635b25062e 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1036,7 +1036,7 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num, return(NULL); } if ((skp == NULL) || (*skp == NULL)) - sk=sk_SSL_CIPHER_new(NULL); /* change perhaps later */ + sk=sk_SSL_CIPHER_new_null(); /* change perhaps later */ else { sk= *skp; |