diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-05-11 11:53:41 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-05-13 16:47:21 +0200 |
| commit | 97fbb0c88c2f601f98e25e57b9f6f9679d14f3a8 (patch) | |
| tree | 27e920c3c82c76b2a31d2ef6e7dd446cd5b1ce14 /fips | |
| parent | 5837e90f08ffcf5ad84933793bc285630018ce26 (diff) | |
Configure: add ios-cross target with ARM assembly support.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'fips')
| -rw-r--r-- | fips/fips_test_suite.c | 6 | ||||
| -rw-r--r-- | fips/fipssyms.h | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c index e2506ff2ae..647de96fa1 100644 --- a/fips/fips_test_suite.c +++ b/fips/fips_test_suite.c @@ -1325,6 +1325,12 @@ int main(int argc, char **argv) FIPS_post_set_callback(post_cb); +#if defined(__APPLE__) && (defined(__arm__) || defined(__aarch64__)) + extern unsigned int OPENSSL_armcap_P; + if (0 == OPENSSL_armcap_P) + fprintf(stderr, "Optimizations disabled\n"); +#endif + printf("\tFIPS-mode test application\n"); printf("\t%s\n\n", FIPS_module_version_text()); diff --git a/fips/fipssyms.h b/fips/fipssyms.h index f5d04d073c..76db619cec 100644 --- a/fips/fipssyms.h +++ b/fips/fipssyms.h @@ -701,6 +701,16 @@ #define _sha1_block_data_order _fips_sha1_block_data_order #define _sha256_block_data_order _fips_sha256_block_data_order #define _sha512_block_data_order _fips_sha512_block_data_order +#define _AES_decrypt _fips_aes_decrypt +#define _AES_encrypt _fips_aes_encrypt +#define _AES_set_decrypt_key _fips_aes_set_decrypt_key +#define _AES_set_encrypt_key _fips_aes_set_encrypt_key +#define _gcm_gmult_4bit _fips_gcm_gmult_4bit +#define _gcm_ghash_4bit _fips_gcm_ghash_4bit +#define _gcm_gmult_neon _fips_gcm_gmult_neon +#define _gcm_ghash_neon _fips_gcm_ghash_neon +#define _bn_GF2m_mul_2x2 _fips_bn_GF2m_mul_2x2 +#define _OPENSSL_cleanse _FIPS_openssl_cleanse #endif #if defined(_MSC_VER) |