The rest of the merge in of the main trunk, a few conflicts resolved.

This commit is contained in:
Richard Levitte
2000-09-17 20:37:33 +00:00
parent 42cc160301
commit ce6990739e
32 changed files with 1864 additions and 496 deletions

View File

@@ -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());