kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check for sk_X509_NAME_push failures.

Browse Source 
Also tidy up the logic slightly.

Change-Id: I708254406b2df52435ec434ac9806e8eb2cbe928
Reviewed-on: https://boringssl-review.googlesource.com/11322
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-09-27 01:20:31 -04:00 committed by Adam Langley
parent d5c72c8bc8
commit 1eeb0b00ba
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ssl/ssl_file.c
View File

@ -164,16 +164,17 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) {
goto err;
}
/* check for duplicates */
xn = X509_NAME_dup(xn);
if (xn == NULL) {
goto err;
}
/* Check for duplicates. */
if (sk_X509_NAME_find(sk, NULL, xn)) {
continue;
}
xn = X509_NAME_dup(xn);
if (xn == NULL ||
!sk_X509_NAME_push(sk /* non-owning */, xn) ||
!sk_X509_NAME_push(ret /* owning */, xn)) {
X509_NAME_free(xn);
} else {
sk_X509_NAME_push(sk, xn);
sk_X509_NAME_push(ret, xn);
goto err;
}
}
@ -197,7 +198,7 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
BIO *in;
X509 *x = NULL;
X509_NAME *xn = NULL;
int ret = 1;
int ret = 0;
int (*oldcmp)(const X509_NAME **a, const X509_NAME **b);
oldcmp = sk_X509_NAME_set_cmp_func(stack, xname_cmp);
@ -220,24 +221,24 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
if (xn == NULL) {
goto err;
}
xn = X509_NAME_dup(xn);
if (xn == NULL) {
goto err;
}
/* Check for duplicates. */
if (sk_X509_NAME_find(stack, NULL, xn)) {
continue;
}
xn = X509_NAME_dup(xn);
if (xn == NULL ||
!sk_X509_NAME_push(stack, xn)) {
X509_NAME_free(xn);
} else {
sk_X509_NAME_push(stack, xn);
goto err;
}
}
ERR_clear_error();
ret = 1;
if (0) {
err:
ret = 0;
}
err:
BIO_free(in);
X509_free(x);