summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cryptlib.c
diff options
context:
space:
mode:
authormiod <>2015-09-13 16:56:11 +0000
committermiod <>2015-09-13 16:56:11 +0000
commit28dd2541f031e76206c8fed414f254999804b7db (patch)
tree270174f49fcd04d8bcc9a537c4988d0f23338ed7 /src/lib/libcrypto/cryptlib.c
parentc03520e21faae31a4683523ca4e556bebdebfdba (diff)
downloadopenbsd-28dd2541f031e76206c8fed414f254999804b7db.tar.gz
openbsd-28dd2541f031e76206c8fed414f254999804b7db.tar.bz2
openbsd-28dd2541f031e76206c8fed414f254999804b7db.zip
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.
Diffstat (limited to 'src/lib/libcrypto/cryptlib.c')
-rw-r--r--src/lib/libcrypto/cryptlib.c14
1 files changed, 1 insertions, 13 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 @@
1/* $OpenBSD: cryptlib.c,v 1.36 2015/09/13 10:02:49 miod Exp $ */ 1/* $OpenBSD: cryptlib.c,v 1.37 2015/09/13 16:56:11 miod 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 *
@@ -628,18 +628,6 @@ CRYPTO_get_lock_name(int type)
628 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) 628 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
629 629
630unsigned int OPENSSL_ia32cap_P[2]; 630unsigned int OPENSSL_ia32cap_P[2];
631unsigned long *
632OPENSSL_ia32cap_loc(void)
633{
634 if (sizeof(long) == 4)
635 /*
636 * If 32-bit application pulls address of OPENSSL_ia32cap_P[0]
637 * clear second element to maintain the illusion that vector
638 * is 32-bit.
639 */
640 OPENSSL_ia32cap_P[1] = 0;
641 return (unsigned long *)OPENSSL_ia32cap_P;
642}
643 631
644uint64_t 632uint64_t
645OPENSSL_cpu_caps(void) 633OPENSSL_cpu_caps(void)