EVP & PROV: Fix all platform inclusions

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10662)

crypto/evp/e_aes.c

@@ -20,7 +20,7 @@
 #include "internal/cryptlib.h"
 #include "crypto/modes.h"
 #include "crypto/siv.h"
-#include "crypto/ciphermode_platform.h"
+#include "crypto/aes_platform.h"
 #include "evp_local.h"
 
 typedef struct {

crypto/evp/e_camellia.c

@@ -19,7 +19,7 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <openssl/camellia.h>
 # include "crypto/evp.h"
 # include "crypto/modes.h"
-# include "crypto/ciphermode_platform.h"
+# include "crypto/cmll_platform.h"
 
 static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                              const unsigned char *iv, int enc);

providers/build.info

@@ -40,7 +40,7 @@ $LIBNONFIPS=libnonfips.a
 $LIBFIPS=libfips.a
 
 # Enough of our implementations include prov/ciphercommon.h (present in
-# providers/implementations/include), which includes crypto/ciphermode_platform.h
+# providers/implementations/include), which includes crypto/*_platform.h
 # (present in include), which in turn may include very internal header
 # files in crypto/, so let's have a common include list for them all.
 $COMMON_INCLUDES=../crypto ../include implementations/include common/include

providers/implementations/ciphers/cipher_aes.h

@@ -9,6 +9,7 @@
 
 #include <openssl/aes.h>
 #include "prov/ciphercommon.h"
+#include "crypto/aes_platform.h"
 
 typedef struct prov_aes_ctx_st {
     PROV_CIPHER_CTX base;      /* Must be first */

providers/implementations/ciphers/cipher_aes_ccm.h

@@ -10,6 +10,7 @@
 #include <openssl/aes.h>
 #include "prov/ciphercommon.h"
 #include "prov/ciphercommon_ccm.h"
+#include "crypto/aes_platform.h"
 
 typedef struct prov_aes_ccm_ctx_st {
     PROV_CCM_CTX base;         /* Must be first */

providers/implementations/ciphers/cipher_aes_gcm.h

@@ -10,6 +10,7 @@
 #include <openssl/aes.h>
 #include "prov/ciphercommon.h"
 #include "prov/ciphercommon_gcm.h"
+#include "crypto/aes_platform.h"
 
 typedef struct prov_aes_gcm_ctx_st {
     PROV_GCM_CTX base;          /* must be first entry in struct */

providers/implementations/ciphers/cipher_aes_ocb.h

@@ -9,6 +9,7 @@
 
 #include <openssl/aes.h>
 #include "prov/ciphercommon.h"
+#include "crypto/aes_platform.h"
 
 #define OCB_MAX_TAG_LEN     AES_BLOCK_SIZE
 #define OCB_MAX_DATA_LEN    AES_BLOCK_SIZE

providers/implementations/ciphers/cipher_aes_siv.h

@@ -8,7 +8,8 @@
  */
 
 #include "prov/ciphercommon.h"
-#include "include/crypto/siv.h"
+#include "crypto/aes_platform.h"
+#include "crypto/siv.h"
 
 typedef struct prov_cipher_hw_aes_siv_st {
     int (*initkey)(void *ctx, const uint8_t *key, size_t keylen);

providers/implementations/ciphers/cipher_aes_xts.h

@@ -9,6 +9,7 @@
 
 #include <openssl/aes.h>
 #include "prov/ciphercommon.h"
+#include "crypto/aes_platform.h"
 
 /*
  * Available in cipher_fips.c, and compiled with different values depending

providers/implementations/ciphers/cipher_camellia.h

@@ -9,6 +9,7 @@
 
 #include "openssl/camellia.h"
 #include "prov/ciphercommon.h"
+#include "crypto/cmll_platform.h"
 
 typedef struct prov_camellia_ctx_st {
     PROV_CIPHER_CTX base;      /* Must be first */

providers/implementations/ciphers/cipher_des.h

@@ -8,6 +8,7 @@
  */
 
 #include <openssl/des.h>
+#include "crypto/des_platform.h"
 
 /* TODO(3.0) Figure out what flags need to be here */
 #define TDES_FLAGS (EVP_CIPH_RAND_KEY)

providers/implementations/ciphers/cipher_tdes.h

@@ -9,6 +9,7 @@
 
 #include <openssl/des.h>
 #include <openssl/core_numbers.h>
+#include "crypto/des_platform.h"
 
 #define DES_BLOCK_SIZE 8
 #define TDES_IVLEN 8

providers/implementations/include/prov/ciphercommon.h

@@ -13,7 +13,6 @@
 #include <openssl/evp.h>
 #include "internal/cryptlib.h"
 #include "crypto/modes.h"
-#include "crypto/ciphermode_platform.h"
 
 #define MAXCHUNK    ((size_t)1 << (sizeof(long) * 8 - 2))
 #define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))