diff options
| author |   Pramod Raghavendra Jayathirth <pramod.raghavendra.jayathirth@intel.com> | 2019-01-02 09:59:48 -0800 |
|---|---|---|
| committer | Pramod Raghavendra Jayathirth <pramod.raghavendra.jayathirth@intel.com> | 2019-03-29 09:59:04 -0700 |
| commit | 7626b75b3c71173ba62c2f92d22bab8f4291e44a (patch) | |
| tree | 7308a2628a014fef0f245ef4f00408cf92d15e60 /SoftHSMv2/m4/acx_openssl_ecc.m4 | |
| parent | f2ff7a136a152b36b3aa4d0d574796e6edbef24a (diff) | |
Update SoftHSM v2.0 to the latest version
Change-Id: Ib3ec2c297f897c82776a66fe2ad55b18984c0337
Issue-ID: AAF-687
Signed-off-by: Pramod Raghavendra Jayathirth <pramod.raghavendra.jayathirth@intel.com>
Diffstat (limited to 'SoftHSMv2/m4/acx_openssl_ecc.m4')
| -rw-r--r-- | SoftHSMv2/m4/acx_openssl_ecc.m4 | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/SoftHSMv2/m4/acx_openssl_ecc.m4 b/SoftHSMv2/m4/acx_openssl_ecc.m4 index 612c505..3ecf7a9 100644 --- a/SoftHSMv2/m4/acx_openssl_ecc.m4 +++ b/SoftHSMv2/m4/acx_openssl_ecc.m4 @@ -8,28 +8,35 @@ AC_DEFUN([ACX_OPENSSL_ECC],[ LIBS="$CRYPTO_LIBS $LIBS" AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ - AC_LANG_SOURCE([[ - #include <openssl/ecdsa.h> - #include <openssl/objects.h> - int main() - { - EC_KEY *ec256, *ec384, *ec521; + AC_CACHE_VAL([acx_cv_lib_openssl_ecc_support],[ + acx_cv_lib_openssl_ecc_support=no + AC_RUN_IFELSE([ + AC_LANG_SOURCE([[ + #include <openssl/ecdsa.h> + #include <openssl/objects.h> + int main() + { + EC_KEY *ec256, *ec384, *ec521; - ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); - ec384 = EC_KEY_new_by_curve_name(NID_secp384r1); - ec521 = EC_KEY_new_by_curve_name(NID_secp521r1); - if (ec256 == NULL || ec384 == NULL || ec521 == NULL) - return 1; - return 0; - } - ]]) - ],[ - AC_MSG_RESULT([Found P256, P384, and P521]) - ],[ - AC_MSG_RESULT([Cannot find P256, P384, or P521]) - AC_MSG_ERROR([OpenSSL library has no ECC support]) - ],[]) + ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + ec384 = EC_KEY_new_by_curve_name(NID_secp384r1); + ec521 = EC_KEY_new_by_curve_name(NID_secp521r1); + if (ec256 == NULL || ec384 == NULL || ec521 == NULL) + return 1; + return 0; + } + ]]) + ],[ + AC_MSG_RESULT([Found P256, P384, and P521]) + acx_cv_lib_openssl_ecc_support=yes + ],[ + AC_MSG_RESULT([Cannot find P256, P384, or P521]) + AC_MSG_ERROR([OpenSSL library has no ECC support]) + ],[ + AC_MSG_WARN([Cannot test, assuming P256, P384, and P521]) + acx_cv_lib_openssl_ecc_support=yes + ]) + ]) AC_LANG_POP([C]) CPPFLAGS=$tmp_CPPFLAGS |