Add back a few missing compatibility stubs

ok beck@

2 files changed, 37 insertions, 4 deletions

diff --git a/lib/libcrypto/cryptlib.c b/lib/libcrypto/cryptlib.c
index e10b4f0b580..2af8b12095d 100644
--- a/lib/libcrypto/cryptlib.c
+++ b/lib/libcrypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.42 2018/11/11 06:41:28 bcook Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.43 2018/11/11 16:32:28 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -166,12 +166,41 @@ CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num,
 	return;
 }
 
+int
+(*CRYPTO_get_add_lock_callback(void))(int *num, int mount, int type,
+    const char *file, int line)
+{
+	return NULL;
+}
+
 const char *
 CRYPTO_get_lock_name(int lock_num)
 {
 	return "";
 }
 
+struct CRYPTO_dynlock_value *
+CRYPTO_get_dynlock_value(int i)
+{
+	return NULL;
+}
+
+int CRYPTO_get_new_dynlockid(void)
+{
+	return 0;
+}
+
+void
+CRYPTO_destroy_dynlockid(int i)
+{
+	return;
+}
+
+int CRYPTO_get_new_lockid(char *name)
+{
+	return 0;
+}
+
 int
 CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *))
 {
@@ -179,6 +208,12 @@ CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *))
 }
 
 void
+(*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *)
+{
+	return NULL;
+}
+
+void
 CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val)
 {
 	return;
diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h
index 744079b5bd0..8d549da8b54 100644
--- a/lib/libcrypto/crypto.h
+++ b/lib/libcrypto/crypto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.h,v 1.48 2018/11/11 06:41:28 bcook Exp $ */
+/* $OpenBSD: crypto.h,v 1.49 2018/11/11 16:32:28 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -399,9 +399,7 @@ void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
 void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
 int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
 void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
-#endif
 
-#ifndef LIBRESSL_INTERNAL
 int CRYPTO_get_new_dynlockid(void);
 void CRYPTO_destroy_dynlockid(int i);
 struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i);