include $(top_srcdir)/Makefile.am.common
-YFLAGS = -dt
+YFLAGS = -d -t
lib_LTLIBRARIES = libasn1.la
-libasn1_la_LDFLAGS = -version-info 6:1:1
+libasn1_la_LDFLAGS = -version-info 8:0:0
-libasn1_la_LIBADD = @LIB_com_err@
+if versionscript
+libasn1_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
+endif
+
+
+libasn1_la_LIBADD = \
+ @LIB_com_err@ \
+ $(LIBADD_roken)
BUILT_SOURCES = \
$(gen_files_rfc2459:.x=.c) \
$(gen_files_pkcs9:.x=.c) \
$(gen_files_pkcs12:.x=.c) \
$(gen_files_digest:.x=.c) \
+ $(gen_files_kx509:.x=.c) \
asn1_err.h \
asn1_err.c
asn1_AD_IF_RELEVANT.x \
asn1_AD_KDCIssued.x \
asn1_AD_MANDATORY_FOR_KDC.x \
+ asn1_AD_LoginAlias.x \
asn1_APOptions.x \
asn1_AP_REP.x \
asn1_AP_REQ.x \
asn1_PA_SAM_REDIRECT.x \
asn1_PA_SAM_RESPONSE_2.x \
asn1_PA_SAM_TYPE.x \
+ asn1_PA_ClientCanonicalized.x \
+ asn1_PA_ClientCanonicalizedNames.x \
+ asn1_PA_SvrReferralData.x \
+ asn1_PA_ServerReferralData.x \
+ asn1_PA_SERVER_REFERRAL_DATA.x \
asn1_PROV_SRV_LOCATION.x \
asn1_Principal.x \
asn1_PrincipalName.x \
+ asn1_Principals.x \
asn1_Realm.x \
asn1_SAMFlags.x \
asn1_TGS_REP.x \
asn1_krb5int32.x \
asn1_krb5uint32.x \
asn1_KRB5SignedPathData.x \
- asn1_KRB5SignedPathPrincipals.x \
asn1_KRB5SignedPath.x
gen_files_cms = \
asn1_UnprotectedAttributes.x
gen_files_rfc2459 = \
+ asn1_AccessDescription.x \
asn1_AlgorithmIdentifier.x \
asn1_Attribute.x \
asn1_AttributeType.x \
asn1_AttributeTypeAndValue.x \
asn1_AttributeValue.x \
+ asn1_AuthorityInfoAccessSyntax.x \
asn1_AuthorityKeyIdentifier.x \
asn1_BaseDistance.x \
asn1_BasicConstraints.x \
asn1_CRLCertificateList.x \
+ asn1_CRLDistributionPoints.x \
asn1_CRLReason.x \
asn1_Certificate.x \
asn1_CertificateSerialNumber.x \
asn1_DSASigValue.x \
asn1_DigestInfo.x \
asn1_DirectoryString.x \
+ asn1_DistributionPoint.x \
+ asn1_DistributionPointName.x \
+ asn1_DistributionPointReasonFlags.x \
asn1_DomainParameters.x \
+ asn1_ECParameters.x \
+ asn1_ECPoint.x \
+ asn1_ECDSA_Sig_Value.x \
asn1_ExtKeyUsage.x \
asn1_Extension.x \
asn1_Extensions.x \
asn1_Name.x \
asn1_NameConstraints.x \
asn1_OtherName.x \
+ asn1_PKIXXmppAddr.x \
+ asn1_ProxyCertInfo.x \
+ asn1_ProxyPolicy.x \
asn1_RDNSequence.x \
asn1_RSAPrivateKey.x \
asn1_RSAPublicKey.x \
asn1_ValidationParms.x \
asn1_Validity.x \
asn1_Version.x \
+ asn1_id_Userid.x \
asn1_id_aes_128_cbc.x \
asn1_id_aes_192_cbc.x \
asn1_id_aes_256_cbc.x \
+ asn1_id_at_commonName.x \
+ asn1_id_at_countryName.x \
+ asn1_id_at_generationQualifier.x \
+ asn1_id_at_givenName.x \
+ asn1_id_at_initials.x \
+ asn1_id_at_localityName.x \
+ asn1_id_at_name.x \
+ asn1_id_at_organizationName.x \
+ asn1_id_at_organizationalUnitName.x \
+ asn1_id_at_pseudonym.x \
+ asn1_id_at_serialNumber.x \
+ asn1_id_at_stateOrProvinceName.x \
+ asn1_id_at_streetAddress.x \
+ asn1_id_at_surname.x \
asn1_id_dhpublicnumber.x \
+ asn1_id_domainComponent.x \
asn1_id_dsa.x \
asn1_id_dsa_with_sha1.x \
+ asn1_id_ecDH.x \
+ asn1_id_ecMQV.x \
+ asn1_id_ecPublicKey.x \
+ asn1_id_ec_group_secp160r1.x \
+ asn1_id_ec_group_secp160r2.x \
+ asn1_id_ec_group_secp256r1.x \
+ asn1_id_ecdsa_with_SHA1.x \
+ asn1_id_ecdsa_with_SHA256.x \
+ asn1_id_heim_rsa_pkcs1_x509.x \
+ asn1_id_ms_cert_enroll_domaincontroller.x \
+ asn1_id_ms_client_authentication.x \
+ asn1_id_netscape.x \
+ asn1_id_netscape_cert_comment.x \
asn1_id_nistAlgorithm.x \
asn1_id_nist_aes_algs.x \
asn1_id_nist_sha_algs.x \
- asn1_id_sha224.x \
- asn1_id_sha256.x \
- asn1_id_sha384.x \
- asn1_id_sha512.x \
asn1_id_pkcs1_md2WithRSAEncryption.x \
asn1_id_pkcs1_md5WithRSAEncryption.x \
asn1_id_pkcs1_rsaEncryption.x \
asn1_id_pkcs_1.x \
asn1_id_pkcs_2.x \
asn1_id_pkcs_3.x \
+ asn1_id_pkix.x \
+ asn1_id_pkix_kp.x \
+ asn1_id_pkix_kp_OCSPSigning.x \
+ asn1_id_pkix_kp_clientAuth.x \
+ asn1_id_pkix_kp_emailProtection.x \
+ asn1_id_pkix_kp_serverAuth.x \
+ asn1_id_pkix_kp_timeStamping.x \
+ asn1_id_pkix_on.x \
+ asn1_id_pkix_on_dnsSRV.x \
+ asn1_id_pkix_on_xmppAddr.x \
+ asn1_id_pkix_pe.x \
+ asn1_id_pkix_pe_authorityInfoAccess.x \
+ asn1_id_pkix_pe_proxyCertInfo.x \
+ asn1_id_pkix_ppl.x \
+ asn1_id_pkix_ppl_anyLanguage.x \
+ asn1_id_pkix_ppl_independent.x \
+ asn1_id_pkix_ppl_inheritAll.x \
asn1_id_rsa_digestAlgorithm.x \
asn1_id_rsa_digest_md2.x \
asn1_id_rsa_digest_md4.x \
asn1_id_rsadsi_encalg.x \
asn1_id_rsadsi_rc2_cbc.x \
asn1_id_secsig_sha_1.x \
+ asn1_id_sha224.x \
+ asn1_id_sha256.x \
+ asn1_id_sha384.x \
+ asn1_id_sha512.x \
+ asn1_id_uspkicommon_card_id.x \
+ asn1_id_uspkicommon_piv_interim.x \
asn1_id_x509_ce.x \
asn1_id_x509_ce_authorityKeyIdentifier.x \
asn1_id_x509_ce_basicConstraints.x \
asn1_id_x509_ce_subjectAltName.x \
asn1_id_x509_ce_subjectDirectoryAttributes.x \
asn1_id_x509_ce_subjectKeyIdentifier.x \
- asn1_id_x9_57.x \
asn1_id_x520_at.x \
- asn1_id_at_commonName.x \
- asn1_id_at_surname.x \
- asn1_id_at_serialNumber.x \
- asn1_id_at_countryName.x \
- asn1_id_at_localityName.x \
- asn1_id_at_stateOrProvinceName.x \
- asn1_id_at_organizationName.x \
- asn1_id_at_organizationalUnitName.x \
- asn1_id_at_name.x \
- asn1_id_at_givenName.x \
- asn1_id_at_initials.x \
- asn1_id_at_generationQualifier.x \
- asn1_id_at_pseudonym.x \
- asn1_id_domainComponent.x \
- asn1_id_Userid.x \
- asn1_id_pkix_pe.x \
- asn1_id_pe_proxyCertInfo.x \
- asn1_ProxyCertInfo.x \
- asn1_ProxyPolicy.x
-
+ asn1_id_x9_57.x
gen_files_pkinit = \
asn1_id_pkinit.x \
asn1_id_pkekuoid.x \
asn1_id_pkkdcekuoid.x \
asn1_id_pkinit_san.x \
+ asn1_id_pkinit_ms_eku.x \
asn1_id_pkinit_ms_san.x \
+ asn1_id_pkinit_kdf.x \
+ asn1_id_pkinit_kdf_ah_sha1.x \
+ asn1_id_pkinit_kdf_ah_sha256.x \
+ asn1_id_pkinit_kdf_ah_sha512.x \
+ asn1_MS_UPN_SAN.x \
asn1_DHNonce.x \
+ asn1_KDFAlgorithmId.x \
asn1_TrustedCA.x \
asn1_ExternalPrincipalIdentifier.x \
asn1_ExternalPrincipalIdentifiers.x \
asn1_DHRepInfo.x \
asn1_PA_PK_AS_REP.x \
asn1_KDCDHKeyInfo.x \
- asn1_TrustedCA_Win2k.x \
asn1_ReplyKeyPack.x \
asn1_TD_DH_PARAMETERS.x \
asn1_PKAuthenticator_Win2k.x \
asn1_AuthPack_Win2k.x \
+ asn1_TrustedCA_Win2k.x \
+ asn1_PA_PK_AS_REQ_Win2k.x \
asn1_PA_PK_AS_REP_Win2k.x \
+ asn1_PA_PK_AS_REP_BTMM.x \
asn1_KDCDHKeyInfo_Win2k.x \
- asn1_PA_PK_AS_REQ_Win2k.x \
- asn1_ReplyKeyPack_Win2k.x
+ asn1_ReplyKeyPack_Win2k.x \
+ asn1_PkinitSP80056AOtherInfo.x \
+ asn1_PkinitSuppPubInfo.x
gen_files_pkcs12 = \
asn1_id_pkcs_12.x \
gen_files_test = \
asn1_TESTAlloc.x \
asn1_TESTAllocInner.x \
+ asn1_TESTCONTAINING.x \
+ asn1_TESTCONTAININGENCODEDBY.x \
+ asn1_TESTCONTAININGENCODEDBY2.x \
asn1_TESTChoice1.x \
asn1_TESTChoice2.x \
+ asn1_TESTDer.x \
+ asn1_TESTENCODEDBY.x \
asn1_TESTImplicit.x \
asn1_TESTImplicit2.x \
asn1_TESTInteger.x \
asn1_TESTInteger3.x \
asn1_TESTLargeTag.x \
asn1_TESTSeq.x \
- asn1_TESTSeqOf.x
+ asn1_TESTUSERCONSTRAINED.x \
+ asn1_TESTSeqOf.x \
+ asn1_TESTOSSize1.x \
+ asn1_TESTSeqSizeOf1.x \
+ asn1_TESTSeqSizeOf2.x \
+ asn1_TESTSeqSizeOf3.x \
+ asn1_TESTSeqSizeOf4.x
gen_files_digest = \
+ asn1_DigestError.x \
asn1_DigestInit.x \
asn1_DigestInitReply.x \
- asn1_DigestRequest.x \
- asn1_DigestError.x \
- asn1_DigestResponse.x \
- asn1_DigestReqInner.x \
+ asn1_DigestREP.x \
asn1_DigestREQ.x \
asn1_DigestRepInner.x \
- asn1_DigestREP.x
-
+ asn1_DigestReqInner.x \
+ asn1_DigestRequest.x \
+ asn1_DigestResponse.x \
+ asn1_DigestTypes.x \
+ asn1_NTLMInit.x \
+ asn1_NTLMInitReply.x \
+ asn1_NTLMRequest.x \
+ asn1_NTLMResponse.x
+
+gen_files_kx509 = \
+ asn1_Kx509Response.x \
+ asn1_Kx509Request.x
noinst_PROGRAMS = asn1_compile asn1_print asn1_gen
-check_PROGRAMS = check-der check-gen
-TESTS = check-der check-gen
+TESTS = check-der check-gen check-timegm check-ber
+check_PROGRAMS = $(TESTS)
asn1_gen_SOURCES = asn1_gen.c
asn1_print_SOURCES = asn1_print.c
-check_der_SOURCES = check-der.c check-common.c
+check_der_SOURCES = check-der.c check-common.c check-common.h
-dist_check_gen_SOURCES = check-gen.c check-common.c
+dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h
nodist_check_gen_SOURCES = $(gen_files_test:.x=.c)
asn1_compile_SOURCES = \
+ asn1-common.h \
+ asn1_queue.h \
+ asn1parse.y \
+ der.h \
gen.c \
gen_copy.c \
gen_decode.c \
gen_free.c \
gen_glue.c \
gen_length.c \
+ gen_locl.h \
gen_seq.c \
hash.c \
+ hash.h \
lex.l \
+ lex.h \
main.c \
- parse.y \
- symbol.c
+ symbol.c \
+ symbol.h
dist_libasn1_la_SOURCES = \
+ der-protos.h \
+ der_locl.h \
der.c \
+ der.h \
der_get.c \
der_put.c \
der_free.c \
der_copy.c \
der_cmp.c \
der_format.c \
+ heim_asn1.h \
extra.c \
timegm.c
-nodist_libasn1_la_SOURCES = \
- $(BUILT_SOURCES)
+nodist_libasn1_la_SOURCES = $(BUILT_SOURCES)
asn1_compile_LDADD = \
$(LIB_roken) $(LEXLIB)
$(LIB_roken)
check_gen_LDADD = $(check_der_LDADD)
+check_ber_LDADD = $(check_der_LDADD)
asn1_print_LDADD = $(check_der_LDADD)
asn1_gen_LDADD = $(check_der_LDADD)
+check_timegm_LDADD = $(check_der_LDADD)
-CLEANFILES = lex.c parse.c parse.h \
+CLEANFILES = \
$(BUILT_SOURCES) \
$(gen_files_rfc2459) \
$(gen_files_cms) \
$(gen_files_pkcs9) \
$(gen_files_pkcs12) \
$(gen_files_digest) \
- $(gen_files_test) \
+ $(gen_files_kx509) \
+ $(gen_files_test) $(nodist_check_gen_SOURCES) \
rfc2459_asn1_files rfc2459_asn1.h \
cms_asn1_files cms_asn1.h \
krb5_asn1_files krb5_asn1.h \
pkcs9_asn1_files pkcs9_asn1.h \
pkcs12_asn1_files pkcs12_asn1.h \
digest_asn1_files digest_asn1.h \
+ kx509_asn1_files kx509_asn1.h \
test_asn1_files test_asn1.h
-nodist_include_HEADERS = asn1_err.h der.h der-protos.h heim_asn1.h
+dist_include_HEADERS = der.h heim_asn1.h der-protos.h
+
+nodist_include_HEADERS = asn1_err.h
nodist_include_HEADERS += krb5_asn1.h
nodist_include_HEADERS += pkinit_asn1.h
nodist_include_HEADERS += cms_asn1.h
nodist_include_HEADERS += pkcs9_asn1.h
nodist_include_HEADERS += pkcs12_asn1.h
nodist_include_HEADERS += digest_asn1.h
+nodist_include_HEADERS += kx509_asn1.h
+
+$(asn1_compile_OBJECTS): asn1parse.h asn1parse.c $(srcdir)/der-protos.h
+$(libasn1_la_OBJECTS): krb5_asn1.h asn1_err.h $(srcdir)/der-protos.h
+$(check_gen_OBJECTS): test_asn1.h
+$(asn1_print_OBJECTS): krb5_asn1.h
-$(asn1_compile_OBJECTS): parse.h parse.c
+asn1parse.h: asn1parse.c
$(gen_files_k5) krb5_asn1.h: krb5_asn1_files
$(gen_files_pkinit) pkinit_asn1.h: pkinit_asn1_files
$(gen_files_pkcs9) pkcs9_asn1.h: pkcs9_asn1_files
$(gen_files_pkcs12) pkcs12_asn1.h: pkcs12_asn1_files
$(gen_files_digest) digest_asn1.h: digest_asn1_files
+$(gen_files_kx509) kx509_asn1.h: kx509_asn1_files
$(gen_files_rfc2459) rfc2459_asn1.h: rfc2459_asn1_files
$(gen_files_cms) cms_asn1.h: cms_asn1_files
$(gen_files_test) test_asn1.h: test_asn1_files
rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
- ./asn1_compile$(EXEEXT) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
+ ./asn1_compile$(EXEEXT) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
-cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1
- ./asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
+cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/cms.asn1 $(srcdir)/cms.opt
+ ./asn1_compile$(EXEEXT) --option-file=$(srcdir)/cms.opt $(srcdir)/cms.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
-krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
- ./asn1_compile$(EXEEXT) --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData $(srcdir)/k5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
+krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
+ ./asn1_compile$(EXEEXT) --option-file=$(srcdir)/krb5.opt $(srcdir)/krb5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1
./asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1
./asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
+kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1
+ ./asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
+
test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
./asn1_compile$(EXEEXT) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
-$(libasn1_la_OBJECTS): krb5_asn1.h asn1_err.h $(srcdir)/der-protos.h
-
-
-$(check_gen_OBJECTS): test_asn1.h
-
-$(asn1_print_OBJECTS): krb5_asn1.h
-
-parse.h: parse.c
-
-EXTRA_DIST = asn1_err.et der-protos.h
+EXTRA_DIST = \
+ cms.asn1 \
+ cms.opt \
+ asn1_err.et \
+ canthandle.asn1 \
+ digest.asn1 \
+ krb5.asn1 \
+ krb5.opt \
+ kx509.asn1 \
+ pkcs12.asn1 \
+ pkcs8.asn1 \
+ pkcs9.asn1 \
+ pkinit.asn1 \
+ rfc2459.asn1 \
+ setchgpw2.asn1 \
+ test.asn1 \
+ test.gen \
+ version-script.map
$(srcdir)/der-protos.h:
cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -o der-protos.h $(dist_libasn1_la_SOURCES) || rm -f der-protos.h