From 28dd2541f031e76206c8fed414f254999804b7db Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 13 Sep 2015 16:56:11 +0000
Subject: 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.

---
 src/lib/libcrypto/cryptlib.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/lib/libcrypto/cryptlib.c')

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)
-- 
cgit v1.2.3-55-g6feb