From 723502d9588ba0e1cc08af1b12654917da74d440 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 4 Nov 2016 17:30:30 +0000
Subject: Replace all uses of magic numbers when operating on OPENSSL_ia32_P[]
 by meaningful constants in a private header file, so that reviewers can
 actually get a chance to figure out what the code is attempting to do without
 knowing all cpuid bits.

While there, turn it from an array of two 32-bit ints into a properly aligned
64-bit int.

Use of OPENSSL_ia32_P is now restricted to the assembler parts. C code will
now always use OPENSSL_cpu_caps() and check for the proper bits in the
whole 64-bit word it returns.

i386 tests and ok jsing@
---
 src/lib/libcrypto/cryptlib.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h
index ad679dfa8d..d44738bf3c 100644
--- a/src/lib/libcrypto/cryptlib.h
+++ b/src/lib/libcrypto/cryptlib.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.h,v 1.24 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: cryptlib.h,v 1.25 2016/11/04 17:30:30 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -73,7 +73,6 @@ extern "C" {
 #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"
 
 void OPENSSL_cpuid_setup(void);
-extern unsigned int OPENSSL_ia32cap_P[];
 
 #ifdef  __cplusplus
 }
-- 
cgit v1.2.3-55-g6feb