From: Matt Caswell <matt@openssl.org>
Date: Thu, 4 May 2017 09:28:00 +0000 (+0100)
Subject: Revert "Fix clang compile time error"
X-Git-Tag: OpenSSL_1_1_1-pre1~1588
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb78552ee14c1caa867dfe782f6d1222c776e439;p=oweals%2Fopenssl.git

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)
---

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);