diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-09-17 18:21:27 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-09-17 18:21:27 +0000 |
| commit | 62324627aa3309e4f72e3ff0241801f4286fa242 (patch) | |
| tree | bcc120d30197a60057eabeee2f438b214d0df73a /ssl | |
| parent | 623eea376a7bff6d50c88407c10f279e6f838de4 (diff) | |
| download | openssl-62324627aa3309e4f72e3ff0241801f4286fa242.tar.gz | |
Use sk_*_new_null() instead of sk_*_new(NULL), since that takes care
of complaints from the compiler about data pointers and function
pointers not being compatible with each other.
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; |