diff options
| author |   beck <beck@openbsd.org> | 2000-03-19 11:07:35 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2000-03-19 11:07:35 +0000 |
| commit | ba5406e9b35230c537ab6fcb7b2fb173a1cea3c3 (patch) | |
| tree | a7183e186150526f5c72717dac37cdabf1b43e51 /lib/libssl/src/ssl/t1_lib.c | |
| parent | Allow environment variables on command/config lines; markk@knigma.org (diff) | |
| download | wireguard-openbsd-ba5406e9b35230c537ab6fcb7b2fb173a1cea3c3.tar.xz wireguard-openbsd-ba5406e9b35230c537ab6fcb7b2fb173a1cea3c3.zip | |
OpenSSL 0.9.5 merge
*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs
Diffstat (limited to 'lib/libssl/src/ssl/t1_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/t1_lib.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/libssl/src/ssl/t1_lib.c b/lib/libssl/src/ssl/t1_lib.c index ddf5c15799e..ca6c03d5af1 100644 --- a/lib/libssl/src/ssl/t1_lib.c +++ b/lib/libssl/src/ssl/t1_lib.c @@ -60,13 +60,9 @@ #include <openssl/objects.h> #include "ssl_locl.h" -char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT; +const char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT; -#ifndef NO_PROTO static long tls1_default_timeout(void); -#else -static long tls1_default_timeout(); -#endif static SSL3_ENC_METHOD TLSv1_enc_data={ tls1_enc, @@ -105,6 +101,9 @@ static SSL_METHOD TLSv1_data= { ssl_bad_method, tls1_default_timeout, &TLSv1_enc_data, + ssl_undefined_function, + ssl3_callback_ctrl, + ssl3_ctx_callback_ctrl, }; static long tls1_default_timeout(void) @@ -142,4 +141,9 @@ long tls1_ctrl(SSL *s, int cmd, long larg, char *parg) { return(0); } + +long tls1_callback_ctrl(SSL *s, int cmd, void *(*fp)()) + { + return(0); + } #endif |