summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2023-11-22 15:43:42 +0000
committertb <>2023-11-22 15:43:42 +0000
commitb5304ec46136934578ac0067cc6dbb300eb75fbd (patch)
tree089e72a6e1cebb5ca546e91eea6f15386c07fdf0 /src/lib
parente0cb0cc3101efe1909900695f5d2d43fd01aa2fc (diff)
downloadopenbsd-b5304ec46136934578ac0067cc6dbb300eb75fbd.tar.gz
openbsd-b5304ec46136934578ac0067cc6dbb300eb75fbd.tar.bz2
openbsd-b5304ec46136934578ac0067cc6dbb300eb75fbd.zip
Move SSL_library_init() next to OPENSSL_init_ssl()
Its current position makes no sense and it will become a wrapper of the latter in a subsequent commit. ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/ssl.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 4ef6f6df7f..8d65a1ec03 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.231 2023/11/19 15:51:49 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.232 2023/11/22 15:43:42 tb 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 *
@@ -1395,8 +1395,6 @@ void SSL_set_accept_state(SSL *s);
1395 1395
1396long SSL_get_default_timeout(const SSL *s); 1396long SSL_get_default_timeout(const SSL *s);
1397 1397
1398int SSL_library_init(void );
1399
1400char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size); 1398char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
1401STACK_OF(X509_NAME) *SSL_dup_CA_list(const STACK_OF(X509_NAME) *sk); 1399STACK_OF(X509_NAME) *SSL_dup_CA_list(const STACK_OF(X509_NAME) *sk);
1402 1400
@@ -2352,6 +2350,7 @@ void ERR_load_SSL_strings(void);
2352#define OPENSSL_INIT_SSL_DEFAULT _OPENSSL_INIT_FLAG_NOOP 2350#define OPENSSL_INIT_SSL_DEFAULT _OPENSSL_INIT_FLAG_NOOP
2353 2351
2354int OPENSSL_init_ssl(uint64_t opts, const void *settings); 2352int OPENSSL_init_ssl(uint64_t opts, const void *settings);
2353int SSL_library_init(void);
2355 2354
2356#ifdef __cplusplus 2355#ifdef __cplusplus
2357} 2356}