提交 1608d658 编写于 作者: T Todd Short 提交者: Richard Levitte

Fix clang compile time error

|version| "could" be used uninitialized here, not really, but the
compiler doesn't understand the flow
Reviewed-by: NRich Salz <rsalz@openssl.org>
Reviewed-by: NMatt Caswell <matt@openssl.org>
Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3373)
上级 37192a92
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <assert.h>
#include "ssl_locl.h" #include "ssl_locl.h"
#include "packet_locl.h" #include "packet_locl.h"
#include <openssl/bio.h> #include <openssl/bio.h>
...@@ -903,7 +904,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) ...@@ -903,7 +904,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
int ret = 0; int ret = 0;
BIO *bin = NULL; BIO *bin = NULL;
size_t num_extensions = 0, contextoff = 0; size_t num_extensions = 0, contextoff = 0;
unsigned int version; unsigned int version = 0;
if (ctx == NULL || file == NULL) { if (ctx == NULL || file == NULL) {
SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PASSED_NULL_PARAMETER); 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) ...@@ -1009,8 +1010,10 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
extension = NULL; extension = NULL;
} }
ret = SSL_CTX_use_serverinfo_ex(ctx, version, serverinfo, assert(version != 0);
serverinfo_length); if (version != 0)
ret = SSL_CTX_use_serverinfo_ex(ctx, version, serverinfo,
serverinfo_length);
end: end:
/* SSL_CTX_use_serverinfo makes a local copy of the serverinfo. */ /* SSL_CTX_use_serverinfo makes a local copy of the serverinfo. */
OPENSSL_free(name); OPENSSL_free(name);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册