diff options
| author | Matt Caswell <matt@openssl.org> | 2017-05-04 10:28:00 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-05-04 16:02:08 +0100 |
| commit | bb78552ee14c1caa867dfe782f6d1222c776e439 (patch) | |
| tree | 00cbc1fd54249bf238bbfc34c246a81842a49958 /ssl/ssl_rsa.c | |
| parent | 689f112d9806fa4a0c2f8c108226639455bc770d (diff) | |
| download | openssl-bb78552ee14c1caa867dfe782f6d1222c776e439.tar.gz | |
Revert "Fix clang compile time error"
This reverts commit 1608d658af4163d2096cb469705d4ba96067877b.
This is the wrong fix for this issue. The next commit provides a better
fix.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3382)
Diffstat (limited to 'ssl/ssl_rsa.c')
| -rw-r--r-- | ssl/ssl_rsa.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index c3f27161f4..f0a058e4bc 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -8,7 +8,6 @@ */ #include <stdio.h> -#include <assert.h> #include "ssl_locl.h" #include "packet_locl.h" #include <openssl/bio.h> @@ -904,7 +903,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) int ret = 0; BIO *bin = NULL; size_t num_extensions = 0, contextoff = 0; - unsigned int version = 0; + unsigned int version; if (ctx == NULL || file == NULL) { SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PASSED_NULL_PARAMETER); @@ -1010,10 +1009,8 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) extension = NULL; } - assert(version != 0); - if (version != 0) - ret = SSL_CTX_use_serverinfo_ex(ctx, version, serverinfo, - serverinfo_length); + ret = SSL_CTX_use_serverinfo_ex(ctx, version, serverinfo, + serverinfo_length); end: /* SSL_CTX_use_serverinfo makes a local copy of the serverinfo. */ OPENSSL_free(name); |