diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2013-02-20 15:54:22 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor.indutny@gmail.com> | 2013-02-20 16:48:20 +0400 |
| commit | f317f5aee91a2c21d68a9b94b0742d6b45bc44e8 (patch) | |
| tree | 79d785ef15fc109c148d4c59d2c1188424468e33 /deps/openssl/openssl/ssl/ssl_rsa.c | |
| parent | f1780a6be63d85023053bc0cbec04106e4e8fe04 (diff) | |
| download | android-node-v8-f317f5aee91a2c21d68a9b94b0742d6b45bc44e8.tar.gz android-node-v8-f317f5aee91a2c21d68a9b94b0742d6b45bc44e8.tar.bz2 android-node-v8-f317f5aee91a2c21d68a9b94b0742d6b45bc44e8.zip | |
openssl: update to 1.0.1e
Diffstat (limited to 'deps/openssl/openssl/ssl/ssl_rsa.c')
| -rw-r--r-- | deps/openssl/openssl/ssl/ssl_rsa.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/deps/openssl/openssl/ssl/ssl_rsa.c b/deps/openssl/openssl/ssl/ssl_rsa.c index c0960b5712..60e7b66859 100644 --- a/deps/openssl/openssl/ssl/ssl_rsa.c +++ b/deps/openssl/openssl/ssl/ssl_rsa.c @@ -710,7 +710,7 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file) ERR_clear_error(); /* clear error stack for SSL_CTX_use_certificate() */ - in=BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file_internal()); if (in == NULL) { SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_BUF_LIB); @@ -723,14 +723,16 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file) goto end; } - x=PEM_read_bio_X509_AUX(in,NULL,ctx->default_passwd_callback,ctx->default_passwd_callback_userdata); + x=PEM_read_bio_X509_AUX(in,NULL,ctx->default_passwd_callback, + ctx->default_passwd_callback_userdata); if (x == NULL) { SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_PEM_LIB); goto end; } - ret=SSL_CTX_use_certificate(ctx,x); + ret = SSL_CTX_use_certificate(ctx, x); + if (ERR_peek_error() != 0) ret = 0; /* Key/certificate mismatch doesn't imply ret==0 ... */ if (ret) @@ -742,13 +744,15 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file) int r; unsigned long err; - if (ctx->extra_certs != NULL) + if (ctx->extra_certs != NULL) { sk_X509_pop_free(ctx->extra_certs, X509_free); ctx->extra_certs = NULL; } - while ((ca = PEM_read_bio_X509(in,NULL,ctx->default_passwd_callback,ctx->default_passwd_callback_userdata)) + while ((ca = PEM_read_bio_X509(in, NULL, + ctx->default_passwd_callback, + ctx->default_passwd_callback_userdata)) != NULL) { r = SSL_CTX_add_extra_chain_cert(ctx, ca); |