summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Vatiainen <hvn@radiatorsoftware.com>2023-01-05 19:15:01 +0200
committerHeikki Vatiainen <hvn@radiatorsoftware.com>2023-01-05 19:45:00 +0200
commitf1f6c0bbe4e7132330cb01ec4533fa6a359d03f9 (patch)
tree1d2172659db24b08490499c800dfcc14ddacdfd1
parentea5a75ff3aabbf09d5372a41bc1fe8be64a92622 (diff)
GH-415 Remove code guraded by obsolete SSL_F_SSL_SET_HELLO_EXTENSION #ifdef.
This was used by the initial EAP-FAST related OpenSSL patch which was never part of the OpenSSL distribution.
-rw-r--r--Changes4
-rw-r--r--SSLeay.xs20
2 files changed, 6 insertions, 18 deletions
diff --git a/Changes b/Changes
index 519842d..418df49 100644
--- a/Changes
+++ b/Changes
@@ -49,6 +49,10 @@ Revision history for Perl extension Net::SSLeay.
originally added to OpenSSL and Net::SSLeay for
EAP-FAST. These changes allow EAP-FAST to work with AEAD
ciphers and with OpenSSL versions 1.1.1 and later.
+ - Remove code guraded by obsolete
+ SSL_F_SSL_SET_HELLO_EXTENSION #ifdef. This was used by the
+ initial EAP-FAST related OpenSSL patch which was never part
+ of the OpenSSL distribution.
1.93_01 2022-03-20
- LibreSSL 3.5.0 has removed access to internal data
diff --git a/SSLeay.xs b/SSLeay.xs
index dc6eccd..aaeacd0 100644
--- a/SSLeay.xs
+++ b/SSLeay.xs
@@ -918,7 +918,7 @@ int session_ticket_ext_cb_invoke(SSL *ssl, const unsigned char *data, int len, v
#endif
-#if defined(SSL_F_SSL_SET_HELLO_EXTENSION) || defined(SSL_F_SSL_SET_SESSION_TICKET_EXT)
+#ifdef SSL_F_SSL_SET_SESSION_TICKET_EXT
int ssleay_session_secret_cb_invoke(SSL* s, void* secret, int *secret_len,
STACK_OF(SSL_CIPHER) *peer_ciphers,
@@ -6771,23 +6771,7 @@ SSL_get_keyblock_size(s)
-#if defined(SSL_F_SSL_SET_HELLO_EXTENSION)
-int
-SSL_set_hello_extension(s, type, data)
- SSL * s
- int type
- PREINIT:
- STRLEN len;
- INPUT:
- char * data = SvPV( ST(2), len);
- CODE:
- RETVAL = SSL_set_hello_extension(s, type, data, len);
- OUTPUT:
- RETVAL
-
-#endif
-
-#if defined(SSL_F_SSL_SET_HELLO_EXTENSION) || defined(SSL_F_SSL_SET_SESSION_TICKET_EXT)
+#ifdef SSL_F_SSL_SET_SESSION_TICKET_EXT
void
SSL_set_session_secret_cb(s,callback=&PL_sv_undef,data=&PL_sv_undef)