The branch master has been updated via 05f4eb2dc983d45bface421e19913ccdfd3f9a9f (commit) from 7a9abccde7b7a5e36efe42d89246f6cfd4d59f44 (commit)
- Log ----------------------------------------------------------------- commit 05f4eb2dc983d45bface421e19913ccdfd3f9a9f Author: Shane Lontis <shane.lon...@oracle.com> Date: Thu Jul 18 08:25:44 2019 +1000 Fix S390X compile error due to missing defines Add the missing S390X_aes_XXX_gcm_CAPABLE() macros into aes_platform.h. Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9403) ----------------------------------------------------------------------- Summary of changes: crypto/include/internal/aes_platform.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/crypto/include/internal/aes_platform.h b/crypto/include/internal/aes_platform.h index 5174081..26d9fdd 100644 --- a/crypto/include/internal/aes_platform.h +++ b/crypto/include/internal/aes_platform.h @@ -315,14 +315,24 @@ void aes256_t4_xts_decrypt(const unsigned char *in, unsigned char *out, # define S390X_aes_128_xts_CAPABLE 1 /* checked by callee */ # define S390X_aes_256_xts_CAPABLE 1 -# define S390X_aes_128_ccm_CAPABLE (S390X_aes_128_CAPABLE && \ - (OPENSSL_s390xcap_P.kmac[0] & \ +# define S390X_aes_128_gcm_CAPABLE (S390X_aes_128_CAPABLE && \ + (OPENSSL_s390xcap_P.kma[0] & \ S390X_CAPBIT(S390X_AES_128))) -# define S390X_aes_192_ccm_CAPABLE (S390X_aes_192_CAPABLE && \ - (OPENSSL_s390xcap_P.kmac[0] & \ +# define S390X_aes_192_gcm_CAPABLE (S390X_aes_192_CAPABLE && \ + (OPENSSL_s390xcap_P.kma[0] & \ S390X_CAPBIT(S390X_AES_192))) -# define S390X_aes_256_ccm_CAPABLE (S390X_aes_256_CAPABLE && \ - (OPENSSL_s390xcap_P.kmac[0] & \ +# define S390X_aes_256_gcm_CAPABLE (S390X_aes_256_CAPABLE && \ + (OPENSSL_s390xcap_P.kma[0] & \ + S390X_CAPBIT(S390X_AES_256))) + +# define S390X_aes_128_ccm_CAPABLE (S390X_aes_128_CAPABLE && \ + (OPENSSL_s390xcap_P.kmac[0] & \ + S390X_CAPBIT(S390X_AES_128))) +# define S390X_aes_192_ccm_CAPABLE (S390X_aes_192_CAPABLE && \ + (OPENSSL_s390xcap_P.kmac[0] & \ + S390X_CAPBIT(S390X_AES_192))) +# define S390X_aes_256_ccm_CAPABLE (S390X_aes_256_CAPABLE && \ + (OPENSSL_s390xcap_P.kmac[0] & \ S390X_CAPBIT(S390X_AES_256))) # define S390X_CCM_AAD_FLAG 0x40