Commit 1fc7d666 authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Fix usage of OPENSSL_NO_*_METHOD 



Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>

MR: #1824
parent ca3895f0

doc/ssl/SSL_CTX_new.pod

+10 −0
Original line number Diff line number Diff line
@@ -33,29 +33,39 @@ functions 
 const SSL_METHOD *SSLv3_client_method(void);

 #endif



 #ifndef OPENSSL_NO_TLS1_METHOD

 const SSL_METHOD *TLSv1_method(void);

 const SSL_METHOD *TLSv1_server_method(void);

 const SSL_METHOD *TLSv1_client_method(void);

 #endif



 #ifndef OPENSSL_NO_TLS1_1_METHOD

 const SSL_METHOD *TLSv1_1_method(void);

 const SSL_METHOD *TLSv1_1_server_method(void);

 const SSL_METHOD *TLSv1_1_client_method(void);

 #endif



 #ifndef OPENSSL_NO_TLS1_2_METHOD

 const SSL_METHOD *TLSv1_2_method(void);

 const SSL_METHOD *TLSv1_2_server_method(void);

 const SSL_METHOD *TLSv1_2_client_method(void);

 #endif



 const SSL_METHOD *DTLS_method(void);

 const SSL_METHOD *DTLS_server_method(void);

 const SSL_METHOD *DTLS_client_method(void);



 #ifndef OPENSSL_NO_DTLS1_METHOD

 const SSL_METHOD *DTLSv1_method(void);

 const SSL_METHOD *DTLSv1_server_method(void);

 const SSL_METHOD *DTLSv1_client_method(void);

 #endif



 #ifndef OPENSSL_NO_DTLS1_2_METHOD

 const SSL_METHOD *DTLSv1_2_method(void);

 const SSL_METHOD *DTLSv1_2_server_method(void);

 const SSL_METHOD *DTLSv1_2_client_method(void);

 #endif



=head1 DESCRIPTION

include/openssl/ssl.h

+10 −0
Original line number Diff line number Diff line
@@ -1656,25 +1656,35 @@ __owur const SSL_METHOD *TLS_method(void); 
__owur const SSL_METHOD *TLS_server_method(void);

__owur const SSL_METHOD *TLS_client_method(void);



# ifndef OPENSSL_NO_TLS1_METHOD

__owur const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */

__owur const SSL_METHOD *TLSv1_server_method(void); /* TLSv1.0 */

__owur const SSL_METHOD *TLSv1_client_method(void); /* TLSv1.0 */

# endif



# ifndef OPENSSL_NO_TLS1_1_METHOD

__owur const SSL_METHOD *TLSv1_1_method(void); /* TLSv1.1 */

__owur const SSL_METHOD *TLSv1_1_server_method(void); /* TLSv1.1 */

__owur const SSL_METHOD *TLSv1_1_client_method(void); /* TLSv1.1 */

# endif



# ifndef OPENSSL_NO_TLS1_2_METHOD

__owur const SSL_METHOD *TLSv1_2_method(void); /* TLSv1.2 */

__owur const SSL_METHOD *TLSv1_2_server_method(void); /* TLSv1.2 */

__owur const SSL_METHOD *TLSv1_2_client_method(void); /* TLSv1.2 */

# endif



# ifndef OPENSSL_NO_DTLS1_METHOD

__owur const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */

__owur const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */

__owur const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */

# endif



# ifndef OPENSSL_NO_DTLS1_2_METHOD

__owur const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */

__owur const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */

__owur const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */

#endif



__owur const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */

__owur const SSL_METHOD *DTLS_server_method(void); /* DTLS 1.0 and 1.2 */

test/clienthellotest.c

+2 −1
Original line number Diff line number Diff line
@@ -115,9 +115,10 @@ int main(int argc, char *argv[]) 
    for (; currtest < TOTAL_NUM_TESTS; currtest++) {

        testresult = 0;

        if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2) {

#ifndef OPENSSL_NO_TLS1_2

#ifndef OPENSSL_NO_TLS1_2_METHOD

            ctx = SSL_CTX_new(TLSv1_2_method());

#else

            testresult = 1;

            continue;

#endif

        } else {

test/ssltest.c

+3 −3
Original line number Diff line number Diff line
@@ -3557,7 +3557,7 @@ static unsigned int psk_server_callback(SSL *ssl, const char *identity, 


static int do_test_cipherlist(void)

{

#if !defined(OPENSSL_NO_SSL3) || !defined(OPENSSL_NO_TLS1)

#if !defined(OPENSSL_NO_SSL3_METHOD) || !defined(OPENSSL_NO_TLS1_METHOD)

    int i = 0;

    const SSL_METHOD *meth;

    const SSL_CIPHER *ci, *tci = NULL;
@@ -3569,7 +3569,7 @@ static int do_test_cipherlist(void) 
    OPENSSL_init_crypto(0, NULL);

#endif



#ifndef OPENSSL_NO_SSL3

#ifndef OPENSSL_NO_SSL3_METHOD

    meth = SSLv3_method();

    tci = NULL;

    while ((ci = meth->get_cipher(i++)) != NULL) {
@@ -3582,7 +3582,7 @@ static int do_test_cipherlist(void) 
        tci = ci;

    }

#endif

#ifndef OPENSSL_NO_TLS1

#ifndef OPENSSL_NO_TLS1_METHOD

    meth = TLSv1_method();

    tci = NULL;

    while ((ci = meth->get_cipher(i++)) != NULL) {