summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
authorbeck <>2000-03-19 11:13:58 +0000
committerbeck <>2000-03-19 11:13:58 +0000
commit796d609550df3a33fc11468741c5d2f6d3df4c11 (patch)
tree6c6d539061caa20372dad0ac4ddb1dfae2fbe7fe /src/lib/libssl/t1_lib.c
parent5be3114c1fd7e0dfea1e38d3abb4cbba75244419 (diff)
downloadopenbsd-796d609550df3a33fc11468741c5d2f6d3df4c11.tar.gz
openbsd-796d609550df3a33fc11468741c5d2f6d3df4c11.tar.bz2
openbsd-796d609550df3a33fc11468741c5d2f6d3df4c11.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 'src/lib/libssl/t1_lib.c')
-rw-r--r--src/lib/libssl/t1_lib.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index ddf5c15799..ca6c03d5af 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -60,13 +60,9 @@
60#include <openssl/objects.h> 60#include <openssl/objects.h>
61#include "ssl_locl.h" 61#include "ssl_locl.h"
62 62
63char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT; 63const char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT;
64 64
65#ifndef NO_PROTO
66static long tls1_default_timeout(void); 65static long tls1_default_timeout(void);
67#else
68static long tls1_default_timeout();
69#endif
70 66
71static SSL3_ENC_METHOD TLSv1_enc_data={ 67static SSL3_ENC_METHOD TLSv1_enc_data={
72 tls1_enc, 68 tls1_enc,
@@ -105,6 +101,9 @@ static SSL_METHOD TLSv1_data= {
105 ssl_bad_method, 101 ssl_bad_method,
106 tls1_default_timeout, 102 tls1_default_timeout,
107 &TLSv1_enc_data, 103 &TLSv1_enc_data,
104 ssl_undefined_function,
105 ssl3_callback_ctrl,
106 ssl3_ctx_callback_ctrl,
108 }; 107 };
109 108
110static long tls1_default_timeout(void) 109static long tls1_default_timeout(void)
@@ -142,4 +141,9 @@ long tls1_ctrl(SSL *s, int cmd, long larg, char *parg)
142 { 141 {
143 return(0); 142 return(0);
144 } 143 }
144
145long tls1_callback_ctrl(SSL *s, int cmd, void *(*fp)())
146 {
147 return(0);
148 }
145#endif 149#endif