Remove extern declarations of OPENSSL_ia32cap_P
[openssl.git] / crypto / evp / e_aes_cbc_hmac_sha1.c
index f6450f399601c51a50ed149f117267d8322ad7ab..9e393f0b88a774b1aa300467c900a18925e9ee84 100644 (file)
@@ -7,17 +7,16 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 
-#include <openssl/opensslconf.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>
 #include <string.h>
-
+#include <openssl/opensslconf.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/aes.h>
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/aes.h>
 #include <openssl/sha.h>
 #include <openssl/rand.h>
-#include "modes_lcl.h"
+#include "internal/cryptlib.h"
+#include "internal/modes_int.h"
 #include "internal/evp_int.h"
 #include "internal/constant_time_locl.h"
 
 #include "internal/evp_int.h"
 #include "internal/constant_time_locl.h"
 
@@ -37,7 +36,6 @@ typedef struct {
         defined(__x86_64)       || defined(__x86_64__)  || \
         defined(_M_AMD64)       || defined(_M_X64)      )
 
         defined(__x86_64)       || defined(__x86_64__)  || \
         defined(_M_AMD64)       || defined(_M_X64)      )
 
-extern unsigned int OPENSSL_ia32cap_P[];
 # define AESNI_CAPABLE   (1<<(57-32))
 
 int aesni_set_encrypt_key(const unsigned char *userKey, int bits,
 # define AESNI_CAPABLE   (1<<(57-32))
 
 int aesni_set_encrypt_key(const unsigned char *userKey, int bits,