Since a major bump of libcrypto is coming, remove OPENSSL_ia32cap and

OPENSSL_ia32cap_loc; nothing in ports uses them besides embedded copies of
OpenSSL. This opens the `all hell gets loose' window.

4 files changed, 4 insertions, 34 deletions

diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index fff59f2dfd..0f2c5970bc 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.36 2015/09/13 10:02:49 miod Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.37 2015/09/13 16:56:11 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -628,18 +628,6 @@ CRYPTO_get_lock_name(int type)
         defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 
 unsigned int  OPENSSL_ia32cap_P[2];
-unsigned long *
-OPENSSL_ia32cap_loc(void)
-{
-        if (sizeof(long) == 4)
-                /*
-                 * If 32-bit application pulls address of OPENSSL_ia32cap_P[0]
-                 * clear second element to maintain the illusion that vector
-                 * is 32-bit.
-                 */
-                OPENSSL_ia32cap_P[1] = 0;
-        return (unsigned long *)OPENSSL_ia32cap_P;
-}
 
 uint64_t
 OPENSSL_cpu_caps(void)
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index f53b858d19..f9dde6e98e 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.h,v 1.38 2015/09/13 10:02:49 miod Exp $ */
+/* $OpenBSD: crypto.h,v 1.39 2015/09/13 16:56:11 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -494,9 +494,6 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
 void OpenSSLDie(const char *file, int line, const char *assertion);
 #define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
 
-unsigned long *OPENSSL_ia32cap_loc(void);
-#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
-
 uint64_t OPENSSL_cpu_caps(void);
 
 int OPENSSL_isservice(void);
diff --git a/src/lib/libssl/src/crypto/cryptlib.c b/src/lib/libssl/src/crypto/cryptlib.c
index fff59f2dfd..0f2c5970bc 100644
--- a/src/lib/libssl/src/crypto/cryptlib.c
+++ b/src/lib/libssl/src/crypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.36 2015/09/13 10:02:49 miod Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.37 2015/09/13 16:56:11 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -628,18 +628,6 @@ CRYPTO_get_lock_name(int type)
         defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 
 unsigned int  OPENSSL_ia32cap_P[2];
-unsigned long *
-OPENSSL_ia32cap_loc(void)
-{
-        if (sizeof(long) == 4)
-                /*
-                 * If 32-bit application pulls address of OPENSSL_ia32cap_P[0]
-                 * clear second element to maintain the illusion that vector
-                 * is 32-bit.
-                 */
-                OPENSSL_ia32cap_P[1] = 0;
-        return (unsigned long *)OPENSSL_ia32cap_P;
-}
 
 uint64_t
 OPENSSL_cpu_caps(void)
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index f53b858d19..f9dde6e98e 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.h,v 1.38 2015/09/13 10:02:49 miod Exp $ */
+/* $OpenBSD: crypto.h,v 1.39 2015/09/13 16:56:11 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -494,9 +494,6 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
 void OpenSSLDie(const char *file, int line, const char *assertion);
 #define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
 
-unsigned long *OPENSSL_ia32cap_loc(void);
-#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
-
 uint64_t OPENSSL_cpu_caps(void);
 
 int OPENSSL_isservice(void);