diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2016-02-02 23:16:20 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2016-03-09 19:38:18 +0100 |
| commit | 1fc7d6664a3d118f9d5de217c9ffd154ed9ddb6f (patch) | |
| tree | bad943bf955e0ec1c03737bc35540ecf851aea2b /test | |
| parent | ca3895f0b52628df29bcf87e139971904f4b9b28 (diff) | |
Fix usage of OPENSSL_NO_*_METHOD
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
MR: #1824
Diffstat (limited to 'test')
| -rw-r--r-- | test/clienthellotest.c | 3 | ||||
| -rw-r--r-- | test/ssltest.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/clienthellotest.c b/test/clienthellotest.c index 877566131a..14fa4c0a12 100644 --- a/test/clienthellotest.c +++ b/test/clienthellotest.c @@ -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 { diff --git a/test/ssltest.c b/test/ssltest.c index 64bf071188..e5f86155c2 100644 --- a/test/ssltest.c +++ b/test/ssltest.c @@ -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) { |