Commit bb78552e authored by Matt Caswell's avatar Matt Caswell
Browse files

Revert "Fix clang compile time error" 



This reverts commit 1608d658.

This is the wrong fix for this issue. The next commit provides a better
fix.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3382)
parent 689f112d

ssl/ssl_rsa.c

+3 −6
Original line number Diff line number Diff line
@@ -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,8 +1009,6 @@ 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);

 end: