From 131c8dd30e83fb33a56b3007e71dc078420f6650 Mon Sep 17 00:00:00 2001 From: Viktor Dukhovni Date: Sat, 7 May 2016 00:52:43 +0000 Subject: [PATCH] Export new ASN1 oid symbols and fix build We added some new OID symbols in libasn1, make them public. When an older Heimdal is already installed and its libraries don't have some newly created symbols we run into build or test problems, if libtool decides to use installed rather than just-built libraries. This was happening with a few of test programs in libhx509. Fixed. --- lib/asn1/libasn1-exports.def | 6 ++++++ lib/hx509/Makefile.am | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/asn1/libasn1-exports.def b/lib/asn1/libasn1-exports.def index 63dfdffa6..62f4337ad 100644 --- a/lib/asn1/libasn1-exports.def +++ b/lib/asn1/libasn1-exports.def @@ -58,9 +58,15 @@ EXPORTS asn1_oid_id_ecPublicKey DATA asn1_oid_id_ec_group_secp160r1 DATA asn1_oid_id_ec_group_secp160r2 DATA + asn1_oid_id_ec_group_secp224r1 DATA asn1_oid_id_ec_group_secp256r1 DATA + asn1_oid_id_ec_group_secp384r1 DATA + asn1_oid_id_ec_group_secp521r1 DATA asn1_oid_id_ecdsa_with_SHA1 DATA + asn1_oid_id_ecdsa_with_SHA224 DATA asn1_oid_id_ecdsa_with_SHA256 DATA + asn1_oid_id_ecdsa_with_SHA384 DATA + asn1_oid_id_ecdsa_with_SHA512 DATA asn1_oid_id_heim_rsa_pkcs1_x509 DATA asn1_oid_id_ms_cert_enroll_domaincontroller DATA asn1_oid_id_ms_client_authentication DATA diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am index cd8ccc553..24c21eaf6 100644 --- a/lib/hx509/Makefile.am +++ b/lib/hx509/Makefile.am @@ -206,10 +206,10 @@ check_PROGRAMS = $(PROGRAM_TESTS) test_soft_pkcs11 LDADD = libhx509.la -test_soft_pkcs11_LDADD = libhx509.la +test_soft_pkcs11_LDADD = libhx509.la $(top_builddir)/lib/asn1/libasn1.la -test_name_LDADD = libhx509.la $(LIB_roken) -test_expr_LDADD = libhx509.la $(LIB_roken) +test_name_LDADD = libhx509.la $(LIB_roken) $(top_builddir)/lib/asn1/libasn1.la +test_expr_LDADD = libhx509.la $(LIB_roken) $(top_builddir)/lib/asn1/libasn1.la TESTS = $(SCRIPT_TESTS) $(PROGRAM_TESTS)