X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fssl_rsa.c;h=c3f27161f4dc153c4455098a6c8d3ae457e42117;hp=f0a058e4bc5c2f6d74b744839051f7439479c262;hb=1608d658af4163d2096cb469705d4ba96067877b;hpb=37192a92d744f8e15e46a2bac3019582fdafd2ba diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index f0a058e4bc..c3f27161f4 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -8,6 +8,7 @@ */ #include +#include #include "ssl_locl.h" #include "packet_locl.h" #include @@ -903,7 +904,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; + unsigned int version = 0; if (ctx == NULL || file == NULL) { SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PASSED_NULL_PARAMETER); @@ -1009,8 +1010,10 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) extension = NULL; } - ret = SSL_CTX_use_serverinfo_ex(ctx, version, serverinfo, - serverinfo_length); + assert(version != 0); + if (version != 0) + 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);