summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
authorbeck <>2018-03-17 16:20:01 +0000
committerbeck <>2018-03-17 16:20:01 +0000
commitd18ae25f28e72831dc3c51f78e0735342540098b (patch)
tree12cc674e7652f4d67e57ec9e1882e6e824b4808d /src/lib/libssl/ssl.h
parent736fdc7bedf7fe8b17717032f7380c5c6e247d0d (diff)
downloadopenbsd-d18ae25f28e72831dc3c51f78e0735342540098b.tar.gz
openbsd-d18ae25f28e72831dc3c51f78e0735342540098b.tar.bz2
openbsd-d18ae25f28e72831dc3c51f78e0735342540098b.zip
Bring in compatibility for OpenSSL 1.1 style init functions.
This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well thread safety modifications for the existing LibreSSL init functions. The initialization routines are called automatically by the normal entry points into the library, as in newer OpenSSL ok jsing@, nits by tb@ and deraadt@
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r--src/lib/libssl/ssl.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 05939f214d..97d1c40a66 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.152 2018/03/17 15:55:52 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.153 2018/03/17 16:20:01 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2112,6 +2112,19 @@ void ERR_load_SSL_strings(void);
2112#define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269 2112#define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269
2113#define SSL_R_PEER_BEHAVING_BADLY 666 2113#define SSL_R_PEER_BEHAVING_BADLY 666
2114 2114
2115/*
2116 * OpenSSL compatible OPENSSL_INIT options
2117 */
2118
2119/*
2120 * These are provided for compatibiliy, but have no effect
2121 * on how LibreSSL is initialized.
2122 */
2123#define OPENSSL_INIT_LOAD_SSL_STRINGS _OPENSSL_INIT_FLAG_NOOP
2124#define OPENSSL_INIT_SSL_DEFAULT _OPENSSL_INIT_FLAG_NOOP
2125
2126int OPENSSL_init_ssl(uint64_t opts, const void *settings);
2127
2115#ifdef __cplusplus 2128#ifdef __cplusplus
2116} 2129}
2117#endif 2130#endif