rename parse.y to asn1parse.y
[metze/heimdal/svnmirror.git] / lib / asn1 / Makefile.am
index e91e0a2c6576ff29607b64a82cfb164d14fac1ea..d434eed223c6d1d93087394fbf00a7b647c0c375 100644 (file)
@@ -5,7 +5,6 @@ include $(top_srcdir)/Makefile.am.common
 YFLAGS = -d -t
 
 lib_LTLIBRARIES = libasn1.la
-noinst_LTLIBRARIES = libnasn1.la
 libasn1_la_LDFLAGS = -version-info 8:0:0
 
 if versionscript
@@ -14,12 +13,9 @@ endif
 
 
 libasn1_la_LIBADD = \
-       libnasn1.la \
        @LIB_com_err@ \
        $(LIBADD_roken)
 
-libasn1_la_SOURCES =
-
 BUILT_SOURCES =                                \
        $(gen_files_rfc2459:.x=.c)      \
        $(gen_files_cms:.x=.c)          \
@@ -104,6 +100,7 @@ gen_files_k5 =                                              \
        asn1_PROV_SRV_LOCATION.x                        \
        asn1_Principal.x                                \
        asn1_PrincipalName.x                            \
+       asn1_Principals.x                               \
        asn1_Realm.x                                    \
        asn1_SAMFlags.x                                 \
        asn1_TGS_REP.x                                  \
@@ -116,7 +113,6 @@ gen_files_k5 =                                              \
        asn1_krb5int32.x                                \
        asn1_krb5uint32.x                               \
        asn1_KRB5SignedPathData.x                       \
-       asn1_KRB5SignedPathPrincipals.x                 \
        asn1_KRB5SignedPath.x
 
 gen_files_cms =                                                \
@@ -163,164 +159,175 @@ 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_Certificates.x                             \
+       asn1_DHPublicKey.x                              \
+       asn1_DSAParams.x                                \
+       asn1_DSAPublicKey.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_GeneralName.x                              \
+       asn1_GeneralNames.x                             \
+       asn1_GeneralSubtree.x                           \
+       asn1_GeneralSubtrees.x                          \
+       asn1_KeyIdentifier.x                            \
+       asn1_KeyUsage.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_RelativeDistinguishedName.x                \
+       asn1_SubjectKeyIdentifier.x                     \
+       asn1_SubjectPublicKeyInfo.x                     \
+       asn1_TBSCRLCertList.x                           \
+       asn1_TBSCertificate.x                           \
+       asn1_TeletexStringx.x                           \
+       asn1_Time.x                                     \
+       asn1_UniqueIdentifier.x                         \
+       asn1_ValidationParms.x                          \
+       asn1_Validity.x                                 \
        asn1_Version.x                                  \
-       asn1_id_pkcs_1.x                                \
-       asn1_id_pkcs1_rsaEncryption.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_pkcs1_md2WithRSAEncryption.x            \
        asn1_id_pkcs1_md5WithRSAEncryption.x            \
+       asn1_id_pkcs1_rsaEncryption.x                   \
        asn1_id_pkcs1_sha1WithRSAEncryption.x           \
        asn1_id_pkcs1_sha256WithRSAEncryption.x         \
        asn1_id_pkcs1_sha384WithRSAEncryption.x         \
        asn1_id_pkcs1_sha512WithRSAEncryption.x         \
-       asn1_id_heim_rsa_pkcs1_x509.x                   \
-       asn1_id_pkcs_2.x                                \
        asn1_id_pkcs2_md2.x                             \
        asn1_id_pkcs2_md4.x                             \
        asn1_id_pkcs2_md5.x                             \
+       asn1_id_pkcs3_des_ede3_cbc.x                    \
+       asn1_id_pkcs3_rc2_cbc.x                         \
+       asn1_id_pkcs3_rc4.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_rsa_digest_md5.x                        \
-       asn1_id_pkcs_3.x                                \
-       asn1_id_pkcs3_rc2_cbc.x                         \
-       asn1_id_pkcs3_rc4.x                             \
-       asn1_id_pkcs3_des_ede3_cbc.x                    \
+       asn1_id_rsadsi_des_ede3_cbc.x                   \
        asn1_id_rsadsi_encalg.x                         \
        asn1_id_rsadsi_rc2_cbc.x                        \
-       asn1_id_rsadsi_des_ede3_cbc.x                   \
        asn1_id_secsig_sha_1.x                          \
-       asn1_id_nistAlgorithm.x                         \
-       asn1_id_nist_aes_algs.x                         \
-       asn1_id_aes_128_cbc.x                           \
-       asn1_id_aes_192_cbc.x                           \
-       asn1_id_aes_256_cbc.x                           \
-       asn1_id_nist_sha_algs.x                         \
-       asn1_id_sha256.x                                \
        asn1_id_sha224.x                                \
+       asn1_id_sha256.x                                \
        asn1_id_sha384.x                                \
        asn1_id_sha512.x                                \
-       asn1_id_dhpublicnumber.x                        \
-       asn1_id_x9_57.x                                 \
-       asn1_id_dsa.x                                   \
-       asn1_id_dsa_with_sha1.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_streetAddress.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_Userid.x                                \
-       asn1_id_domainComponent.x                       \
-       asn1_id_x509_ce.x                               \
        asn1_id_uspkicommon_card_id.x                   \
        asn1_id_uspkicommon_piv_interim.x               \
-       asn1_id_netscape.x                              \
-       asn1_id_netscape_cert_comment.x                 \
-       asn1_id_ms_cert_enroll_domaincontroller.x       \
-       asn1_id_ms_client_authentication.x              \
-       asn1_AlgorithmIdentifier.x                      \
-       asn1_AttributeType.x                            \
-       asn1_AttributeValue.x                           \
-       asn1_TeletexStringx.x                           \
-       asn1_DirectoryString.x                          \
-       asn1_Attribute.x                                \
-       asn1_AttributeTypeAndValue.x                    \
-       asn1_AuthorityInfoAccessSyntax.x                \
-       asn1_AccessDescription.x                        \
-       asn1_RelativeDistinguishedName.x                \
-       asn1_RDNSequence.x                              \
-       asn1_Name.x                                     \
-       asn1_CertificateSerialNumber.x                  \
-       asn1_Time.x                                     \
-       asn1_Validity.x                                 \
-       asn1_UniqueIdentifier.x                         \
-       asn1_SubjectPublicKeyInfo.x                     \
-       asn1_Extension.x                                \
-       asn1_Extensions.x                               \
-       asn1_TBSCertificate.x                           \
-       asn1_Certificate.x                              \
-       asn1_Certificates.x                             \
-       asn1_ValidationParms.x                          \
-       asn1_DomainParameters.x                         \
-       asn1_DHPublicKey.x                              \
-       asn1_OtherName.x                                \
-       asn1_GeneralName.x                              \
-       asn1_GeneralNames.x                             \
-       asn1_id_x509_ce_keyUsage.x                      \
-       asn1_KeyUsage.x                                 \
+       asn1_id_x509_ce.x                               \
        asn1_id_x509_ce_authorityKeyIdentifier.x        \
-       asn1_KeyIdentifier.x                            \
-       asn1_AuthorityKeyIdentifier.x                   \
-       asn1_id_x509_ce_subjectKeyIdentifier.x          \
-       asn1_SubjectKeyIdentifier.x                     \
        asn1_id_x509_ce_basicConstraints.x              \
-       asn1_BasicConstraints.x                         \
-       asn1_id_x509_ce_nameConstraints.x               \
-       asn1_BaseDistance.x                             \
-       asn1_GeneralSubtree.x                           \
-       asn1_GeneralSubtrees.x                          \
-       asn1_NameConstraints.x                          \
-       asn1_id_x509_ce_privateKeyUsagePeriod.x         \
-       asn1_id_x509_ce_certificatePolicies.x           \
-       asn1_id_x509_ce_policyMappings.x                \
-       asn1_id_x509_ce_subjectAltName.x                \
-       asn1_id_x509_ce_issuerAltName.x                 \
-       asn1_id_x509_ce_subjectDirectoryAttributes.x    \
-       asn1_id_x509_ce_policyConstraints.x             \
-       asn1_id_x509_ce_extKeyUsage.x                   \
-       asn1_ExtKeyUsage.x                              \
        asn1_id_x509_ce_cRLDistributionPoints.x         \
+       asn1_id_x509_ce_cRLNumber.x                     \
+       asn1_id_x509_ce_cRLReason.x                     \
+       asn1_id_x509_ce_certificateIssuer.x             \
+       asn1_id_x509_ce_certificatePolicies.x           \
        asn1_id_x509_ce_deltaCRLIndicator.x             \
-       asn1_id_x509_ce_issuingDistributionPoint.x      \
+       asn1_id_x509_ce_extKeyUsage.x                   \
+       asn1_id_x509_ce_freshestCRL.x                   \
        asn1_id_x509_ce_holdInstructionCode.x           \
-       asn1_id_x509_ce_invalidityDate.x                \
-       asn1_id_x509_ce_certificateIssuer.x             \
        asn1_id_x509_ce_inhibitAnyPolicy.x              \
-       asn1_DistributionPointReasonFlags.x             \
-       asn1_DistributionPointName.x                    \
-       asn1_DistributionPoint.x                        \
-       asn1_CRLDistributionPoints.x                    \
-       asn1_DSASigValue.x                              \
-       asn1_DSAPublicKey.x                             \
-       asn1_DSAParams.x                                \
-       asn1_RSAPublicKey.x                             \
-       asn1_RSAPrivateKey.x                            \
-       asn1_DigestInfo.x                               \
-       asn1_TBSCRLCertList.x                           \
-       asn1_CRLCertificateList.x                       \
-       asn1_id_x509_ce_cRLNumber.x                     \
-       asn1_id_x509_ce_freshestCRL.x                   \
-       asn1_id_x509_ce_cRLReason.x                     \
-       asn1_CRLReason.x                                \
-       asn1_PKIXXmppAddr.x                             \
-       asn1_id_pkix.x                                  \
-       asn1_id_pkix_on.x                               \
-       asn1_id_pkix_on_dnsSRV.x                        \
-       asn1_id_pkix_on_xmppAddr.x                      \
-       asn1_id_pkix_kp.x                               \
-       asn1_id_pkix_kp_serverAuth.x                    \
-       asn1_id_pkix_kp_clientAuth.x                    \
-       asn1_id_pkix_kp_emailProtection.x               \
-       asn1_id_pkix_kp_timeStamping.x                  \
-       asn1_id_pkix_kp_OCSPSigning.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_inheritAll.x                   \
-       asn1_id_pkix_ppl_independent.x                  \
-       asn1_ProxyPolicy.x                              \
-       asn1_ProxyCertInfo.x 
+       asn1_id_x509_ce_invalidityDate.x                \
+       asn1_id_x509_ce_issuerAltName.x                 \
+       asn1_id_x509_ce_issuingDistributionPoint.x      \
+       asn1_id_x509_ce_keyUsage.x                      \
+       asn1_id_x509_ce_nameConstraints.x               \
+       asn1_id_x509_ce_policyConstraints.x             \
+       asn1_id_x509_ce_policyMappings.x                \
+       asn1_id_x509_ce_privateKeyUsagePeriod.x         \
+       asn1_id_x509_ce_subjectAltName.x                \
+       asn1_id_x509_ce_subjectDirectoryAttributes.x    \
+       asn1_id_x509_ce_subjectKeyIdentifier.x          \
+       asn1_id_x520_at.x                               \
+       asn1_id_x9_57.x
 
 gen_files_pkinit =                                     \
        asn1_id_pkinit.x                                \
@@ -363,7 +370,7 @@ gen_files_pkinit =                                  \
        asn1_KDCDHKeyInfo_Win2k.x                       \
        asn1_ReplyKeyPack_Win2k.x                       \
        asn1_PkinitSP80056AOtherInfo.x                  \
-       asn1_PkinitSuppPubInfo.x 
+       asn1_PkinitSuppPubInfo.x
 
 gen_files_pkcs12 =                                     \
        asn1_id_pkcs_12.x                               \
@@ -474,6 +481,7 @@ 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                              \
@@ -489,11 +497,10 @@ asn1_compile_SOURCES =                            \
        lex.l                                   \
        lex.h                                   \
        main.c                                  \
-       parse.y                                 \
        symbol.c                                \
        symbol.h
 
-dist_libnasn1_la_SOURCES =                     \
+dist_libasn1_la_SOURCES =                      \
        der-protos.h                            \
        der_locl.h                              \
        der.c                                   \
@@ -509,7 +516,7 @@ dist_libnasn1_la_SOURCES =                  \
        extra.c                                 \
        timegm.c
 
-nodist_libnasn1_la_SOURCES = $(BUILT_SOURCES)
+nodist_libasn1_la_SOURCES = $(BUILT_SOURCES)
 
 asn1_compile_LDADD = \
        $(LIB_roken) $(LEXLIB)
@@ -560,12 +567,12 @@ nodist_include_HEADERS += pkcs12_asn1.h
 nodist_include_HEADERS += digest_asn1.h
 nodist_include_HEADERS += kx509_asn1.h
 
-$(asn1_compile_OBJECTS): parse.h parse.c $(srcdir)/der-protos.h
-$(libnasn1_la_OBJECTS): krb5_asn1.h asn1_err.h $(srcdir)/der-protos.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
 
-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
@@ -581,11 +588,11 @@ $(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 --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) --decode-dce-ber $(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 --sequence=METHOD-DATA --sequence=ETYPE-INFO --sequence=ETYPE-INFO2 $(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)
@@ -609,11 +616,13 @@ 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)
 
 EXTRA_DIST =           \
-       CMS.asn1        \
+       cms.asn1        \
+       cms.opt         \
        asn1_err.et     \
        canthandle.asn1 \
        digest.asn1     \
-       k5.asn1         \
+       krb5.asn1       \
+       krb5.opt        \
        kx509.asn1      \
        pkcs12.asn1     \
        pkcs8.asn1      \
@@ -626,4 +635,4 @@ EXTRA_DIST =                \
        version-script.map
 
 $(srcdir)/der-protos.h:
-       cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -o der-protos.h $(dist_libnasn1_la_SOURCES) || rm -f 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