diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/cryptlib.c | 37 | ||||
| -rw-r--r-- | src/lib/libcrypto/crypto.h | 4 |
2 files changed, 37 insertions, 4 deletions
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c index e10b4f0b58..2af8b12095 100644 --- a/src/lib/libcrypto/cryptlib.c +++ b/src/lib/libcrypto/cryptlib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cryptlib.c,v 1.42 2018/11/11 06:41:28 bcook Exp $ */ | 1 | /* $OpenBSD: cryptlib.c,v 1.43 2018/11/11 16:32:28 bcook Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -166,12 +166,41 @@ CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num, | |||
| 166 | return; | 166 | return; |
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | int | ||
| 170 | (*CRYPTO_get_add_lock_callback(void))(int *num, int mount, int type, | ||
| 171 | const char *file, int line) | ||
| 172 | { | ||
| 173 | return NULL; | ||
| 174 | } | ||
| 175 | |||
| 169 | const char * | 176 | const char * |
| 170 | CRYPTO_get_lock_name(int lock_num) | 177 | CRYPTO_get_lock_name(int lock_num) |
| 171 | { | 178 | { |
| 172 | return ""; | 179 | return ""; |
| 173 | } | 180 | } |
| 174 | 181 | ||
| 182 | struct CRYPTO_dynlock_value * | ||
| 183 | CRYPTO_get_dynlock_value(int i) | ||
| 184 | { | ||
| 185 | return NULL; | ||
| 186 | } | ||
| 187 | |||
| 188 | int CRYPTO_get_new_dynlockid(void) | ||
| 189 | { | ||
| 190 | return 0; | ||
| 191 | } | ||
| 192 | |||
| 193 | void | ||
| 194 | CRYPTO_destroy_dynlockid(int i) | ||
| 195 | { | ||
| 196 | return; | ||
| 197 | } | ||
| 198 | |||
| 199 | int CRYPTO_get_new_lockid(char *name) | ||
| 200 | { | ||
| 201 | return 0; | ||
| 202 | } | ||
| 203 | |||
| 175 | int | 204 | int |
| 176 | CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *)) | 205 | CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *)) |
| 177 | { | 206 | { |
| @@ -179,6 +208,12 @@ CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *)) | |||
| 179 | } | 208 | } |
| 180 | 209 | ||
| 181 | void | 210 | void |
| 211 | (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *) | ||
| 212 | { | ||
| 213 | return NULL; | ||
| 214 | } | ||
| 215 | |||
| 216 | void | ||
| 182 | CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val) | 217 | CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val) |
| 183 | { | 218 | { |
| 184 | return; | 219 | return; |
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index 744079b5bd..8d549da8b5 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto.h,v 1.48 2018/11/11 06:41:28 bcook Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.49 2018/11/11 16:32:28 bcook Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -399,9 +399,7 @@ void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val); | |||
| 399 | void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr); | 399 | void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr); |
| 400 | int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *)); | 400 | int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *)); |
| 401 | void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *); | 401 | void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *); |
| 402 | #endif | ||
| 403 | 402 | ||
| 404 | #ifndef LIBRESSL_INTERNAL | ||
| 405 | int CRYPTO_get_new_dynlockid(void); | 403 | int CRYPTO_get_new_dynlockid(void); |
| 406 | void CRYPTO_destroy_dynlockid(int i); | 404 | void CRYPTO_destroy_dynlockid(int i); |
| 407 | struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i); | 405 | struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i); |
