Fix Windows build

lib/asn1/NTMakefile

@@ -132,7 +132,9 @@ LIBASN1_OBJS=	\
 
 $(OBJ)\oid_resolution.obj: $(LIBASN1_OBJS)
 
-$(LIBASN1): $(LIBASN1_OBJS) $(OBJ)\oid_resolution.obj
+LIBASN1_OBJS2=	$(LIBASN1_OBJS) $(OBJ)\oid_resolution.obj
+
+$(LIBASN1): $(LIBASN1_OBJS2)
 	$(LIBCON_C) -out:$@ @<<
 $(**: =
 )

lib/asn1/libasn1-exports.def

@@ -1,4 +1,5 @@
 EXPORTS
+	add_AttributeValues
 	add_AuthorizationData
 	add_Certificates
 	add_CRLDistributionPoints
@@ -59,8 +60,16 @@ EXPORTS
 	asn1_oid_id_ecPublicKey	DATA
 	asn1_oid_id_heim_rsa_pkcs1_x509	DATA
 	asn1_oid_id_ms_cert_enroll_domaincontroller	DATA
-	asn1_oid_id_netscape	DATA
+	asn1_oid_id_msft	DATA
+	asn1_oid_id_msft_kp_msCodeCom	DATA
+	asn1_oid_id_msft_kp_msCodeInd	DATA
+	asn1_oid_id_msft_kp_msCTLSign	DATA
+	asn1_oid_id_msft_kp_msEFS	DATA
+	asn1_oid_id_msft_kp_msSGC	DATA
+	asn1_oid_id_msft_kp_msSmartcardLogin	DATA
+	asn1_oid_id_msft_kp_msUPN	DATA
 	asn1_oid_id_netscape_cert_comment	DATA
+	asn1_oid_id_netscape	DATA
 	asn1_oid_id_nist_aes_algs	DATA
 	asn1_oid_id_nistAlgorithm	DATA
 	asn1_oid_id_nist_sha_algs	DATA
@@ -71,16 +80,16 @@ EXPORTS
 	asn1_oid_id_pbewithSHAAnd40BitRC2_CBC	DATA
 	asn1_oid_id_pbeWithSHAAnd40BitRC4	DATA
 	asn1_oid_id_pkauthdata	DATA
-	asn1_oid_id_pkcs_1	DATA
-	asn1_oid_id_pkcs_12	DATA
 	asn1_oid_id_pkcs12_bagtypes	DATA
 	asn1_oid_id_pkcs12_certBag	DATA
 	asn1_oid_id_pkcs12_crlBag	DATA
+	asn1_oid_id_pkcs_12	DATA
 	asn1_oid_id_pkcs12_keyBag	DATA
 	asn1_oid_id_pkcs_12PbeIds	DATA
 	asn1_oid_id_pkcs12_pkcs8ShroudedKeyBag	DATA
 	asn1_oid_id_pkcs12_safeContentsBag	DATA
 	asn1_oid_id_pkcs12_secretBag	DATA
+	asn1_oid_id_pkcs_1	DATA
 	asn1_oid_id_pkcs1_md2WithRSAEncryption	DATA
 	asn1_oid_id_pkcs1_md5WithRSAEncryption	DATA
 	asn1_oid_id_pkcs1_rsaEncryption	DATA
@@ -103,13 +112,13 @@ EXPORTS
 	asn1_oid_id_pkcs7_envelopedData	DATA
 	asn1_oid_id_pkcs7_signedAndEnvelopedData	DATA
 	asn1_oid_id_pkcs7_signedData	DATA
-	asn1_oid_id_pkcs_9	DATA
 	asn1_oid_id_pkcs_9_at_certTypes	DATA
 	asn1_oid_id_pkcs_9_at_certTypes_x509	DATA
 	asn1_oid_id_pkcs_9_at_friendlyName	DATA
 	asn1_oid_id_pkcs_9_at_localKeyId	DATA
 	asn1_oid_id_pkcs9_contentType	DATA
 	asn1_oid_id_pkcs9_countersignature	DATA
+	asn1_oid_id_pkcs_9	DATA
 	asn1_oid_id_pkcs9_emailAddress	DATA
 	asn1_oid_id_pkcs9_extReq	DATA
 	asn1_oid_id_pkcs9_messageDigest	DATA
@@ -117,42 +126,60 @@ EXPORTS
 	asn1_oid_id_pkdhkeydata	DATA
 	asn1_oid_id_pkekuoid	DATA
 	asn1_oid_id_pkinit	DATA
-	asn1_oid_id_pkinit_kdf	DATA
 	asn1_oid_id_pkinit_kdf_ah_sha1	DATA
 	asn1_oid_id_pkinit_kdf_ah_sha256	DATA
 	asn1_oid_id_pkinit_kdf_ah_sha512	DATA
+	asn1_oid_id_pkinit_kdf	DATA
 	asn1_oid_id_pkinit_ms_eku	DATA
 	asn1_oid_id_pkinit_ms_san	DATA
 	asn1_oid_id_pkinit_san	DATA
-	asn1_oid_id_pkix	DATA
-	asn1_oid_id_pkix_ad	DATA
 	asn1_oid_id_pkix_ad_caIssuers	DATA
 	asn1_oid_id_pkix_ad_caRepository	DATA
+	asn1_oid_id_pkix_ad	DATA
 	asn1_oid_id_pkix_ad_ocsp	DATA
 	asn1_oid_id_pkix_ad_timeStamping	DATA
-	asn1_oid_id_pkix_kp	DATA
+	asn1_oid_id_pkix	DATA
+	asn1_oid_id_pkix_kp_bgpsec_router	DATA
+	asn1_oid_id_pkix_kp_capwapAC	DATA
+	asn1_oid_id_pkix_kp_capwapWTP	DATA
 	asn1_oid_id_pkix_kp_clientAuth	DATA
+	asn1_oid_id_pkix_kp_cmcArchive	DATA
+	asn1_oid_id_pkix_kp_cmcCA	DATA
+	asn1_oid_id_pkix_kp_cmcRA	DATA
 	asn1_oid_id_pkix_kp_codeSigning	DATA
+	asn1_oid_id_pkix_kp	DATA
+	asn1_oid_id_pkix_kp_DVCS	DATA
 	asn1_oid_id_pkix_kp_emailProtection	DATA
+	asn1_oid_id_pkix_kp_ipsecEndSystem	DATA
+	asn1_oid_id_pkix_kp_ipsecIKE	DATA
+	asn1_oid_id_pkix_kp_ipsecTunnel	DATA
+	asn1_oid_id_pkix_kp_ipsecUser	DATA
 	asn1_oid_id_pkix_kp_OCSPSigning	DATA
+	asn1_oid_id_pkix_kp_secureShellClient	DATA
+	asn1_oid_id_pkix_kp_secureShellServer	DATA
+	asn1_oid_id_pkix_kp_sendOwner	DATA
+	asn1_oid_id_pkix_kp_sendProxiedOwner	DATA
+	asn1_oid_id_pkix_kp_sendProxiedRouter	DATA
+	asn1_oid_id_pkix_kp_sendRouter	DATA
 	asn1_oid_id_pkix_kp_serverAuth	DATA
+	asn1_oid_id_pkix_kp_sipDomain	DATA
 	asn1_oid_id_pkix_kp_timeStamping	DATA
-	asn1_oid_id_pkix_ocsp	DATA
 	asn1_oid_id_pkix_ocsp_basic	DATA
+	asn1_oid_id_pkix_ocsp	DATA
 	asn1_oid_id_pkix_ocsp_nonce	DATA
 	asn1_oid_id_pkix_on	DATA
 	asn1_oid_id_pkix_on_dnsSRV	DATA
 	asn1_oid_id_pkix_on_xmppAddr	DATA
-	asn1_oid_id_pkix_pe	DATA
 	asn1_oid_id_pkix_pe_authorityInfoAccess	DATA
+	asn1_oid_id_pkix_pe	DATA
 	asn1_oid_id_pkix_pe_proxyCertInfo	DATA
 	asn1_oid_id_pkix_pe_subjectInfoAccess	DATA
-	asn1_oid_id_pkix_ppl	DATA
 	asn1_oid_id_pkix_ppl_anyLanguage	DATA
+	asn1_oid_id_pkix_ppl	DATA
 	asn1_oid_id_pkix_ppl_independent	DATA
 	asn1_oid_id_pkix_ppl_inheritAll	DATA
-	asn1_oid_id_pkix_qt	DATA
 	asn1_oid_id_pkix_qt_cps	DATA
+	asn1_oid_id_pkix_qt	DATA
 	asn1_oid_id_pkix_qt_unotice	DATA
 	asn1_oid_id_pkkdcekuoid	DATA
 	asn1_oid_id_pkrkeydata	DATA
@@ -172,7 +199,7 @@ EXPORTS
 	asn1_oid_id_Userid	DATA
 	asn1_oid_id_uspkicommon_card_id	DATA
 	asn1_oid_id_uspkicommon_piv_interim	DATA
-	asn1_oid_id_x509_ce	DATA
+	asn1_oid_id_x509_ce_anyExtendedKeyUsage	DATA
 	asn1_oid_id_x509_ce_authorityKeyIdentifier	DATA
 	asn1_oid_id_x509_ce_basicConstraints	DATA
 	asn1_oid_id_x509_ce_certificateIssuer	DATA
@@ -181,6 +208,7 @@ EXPORTS
 	asn1_oid_id_x509_ce_cRLNumber	DATA
 	asn1_oid_id_x509_ce_cRLReason	DATA
 	asn1_oid_id_x509_ce_cRLReasons	DATA
+	asn1_oid_id_x509_ce	DATA
 	asn1_oid_id_x509_ce_deltaCRLIndicator	DATA
 	asn1_oid_id_x509_ce_extKeyUsage	DATA
 	asn1_oid_id_x509_ce_freshestCRL	DATA
@@ -218,6 +246,7 @@ EXPORTS
 	copy_AttributeType
 	copy_AttributeTypeAndValue
 	copy_AttributeValue
+	copy_AttributeValues
 	copy_AUTHDATA_TYPE
 	copy_Authenticator
 	copy_AuthorityInfoAccessSyntax
@@ -355,6 +384,11 @@ EXPORTS
 	copy_KRB_PRIV
 	copy_KRB_SAFE
 	copy_KRB_SAFE_BODY
+	copy_Kx509CSRPlus
+	copy_Kx509ErrorCode
+	copy_KX509_ERROR_CODE
+	copy_Kx509Request
+	copy_Kx509Response
 	copy_LastReq
 	copy_LR_TYPE
 	copy_MessageDigest
@@ -454,6 +488,7 @@ EXPORTS
 	copy_SignerIdentifier
 	copy_SignerInfo
 	copy_SignerInfos
+	copy_SubjectInfoAccessSyntax
 	copy_SubjectKeyIdentifier
 	copy_SubjectPublicKeyInfo
 	copy_TBSCertificate
@@ -493,6 +528,7 @@ EXPORTS
 	decode_AttributeType
 	decode_AttributeTypeAndValue
 	decode_AttributeValue
+	decode_AttributeValues
 	decode_AUTHDATA_TYPE
 	decode_Authenticator
 	decode_AuthorityInfoAccessSyntax
@@ -630,6 +666,11 @@ EXPORTS
 	decode_KRB_PRIV
 	decode_KRB_SAFE
 	decode_KRB_SAFE_BODY
+	decode_Kx509CSRPlus
+	decode_Kx509ErrorCode
+	decode_KX509_ERROR_CODE
+	decode_Kx509Request
+	decode_Kx509Response
 	decode_LastReq
 	decode_LR_TYPE
 	decode_MessageDigest
@@ -729,6 +770,7 @@ EXPORTS
 	decode_SignerIdentifier
 	decode_SignerInfo
 	decode_SignerInfos
+	decode_SubjectInfoAccessSyntax
 	decode_SubjectKeyIdentifier
 	decode_SubjectPublicKeyInfo
 	decode_TBSCertificate
@@ -770,6 +812,7 @@ EXPORTS
 	der_copy_visible_string
 	der_find_heim_oid_by_name
 	der_find_heim_oid_by_oid
+	der_find_or_parse_heim_oid
 	der_free_bit_string
 	der_free_bmp_string
 	der_free_generalized_time
@@ -894,6 +937,7 @@ EXPORTS
 	encode_AttributeType
 	encode_AttributeTypeAndValue
 	encode_AttributeValue
+	encode_AttributeValues
 	encode_AUTHDATA_TYPE
 	encode_Authenticator
 	encode_AuthorityInfoAccessSyntax
@@ -1031,6 +1075,11 @@ EXPORTS
 	encode_KRB_PRIV
 	encode_KRB_SAFE
 	encode_KRB_SAFE_BODY
+	encode_Kx509CSRPlus
+	encode_Kx509ErrorCode
+	encode_KX509_ERROR_CODE
+	encode_Kx509Request
+	encode_Kx509Response
 	encode_LastReq
 	encode_LR_TYPE
 	encode_MessageDigest
@@ -1130,6 +1179,7 @@ EXPORTS
 	encode_SignerIdentifier
 	encode_SignerInfo
 	encode_SignerInfos
+	encode_SubjectInfoAccessSyntax
 	encode_SubjectKeyIdentifier
 	encode_SubjectPublicKeyInfo
 	encode_TBSCertificate
@@ -1170,6 +1220,7 @@ EXPORTS
 	free_AttributeType
 	free_AttributeTypeAndValue
 	free_AttributeValue
+	free_AttributeValues
 	free_AUTHDATA_TYPE
 	free_Authenticator
 	free_AuthorityInfoAccessSyntax
@@ -1307,6 +1358,11 @@ EXPORTS
 	free_KRB_PRIV
 	free_KRB_SAFE
 	free_KRB_SAFE_BODY
+	free_Kx509CSRPlus
+	free_Kx509ErrorCode
+	free_KX509_ERROR_CODE
+	free_Kx509Request
+	free_Kx509Response
 	free_LastReq
 	free_LR_TYPE
 	free_MessageDigest
@@ -1406,6 +1462,7 @@ EXPORTS
 	free_SignerIdentifier
 	free_SignerInfo
 	free_SignerInfos
+	free_SubjectInfoAccessSyntax
 	free_SubjectKeyIdentifier
 	free_SubjectPublicKeyInfo
 	free_TBSCertificate
@@ -1467,6 +1524,7 @@ EXPORTS
 	length_AttributeType
 	length_AttributeTypeAndValue
 	length_AttributeValue
+	length_AttributeValues
 	length_AUTHDATA_TYPE
 	length_Authenticator
 	length_AuthorityInfoAccessSyntax
@@ -1604,6 +1662,11 @@ EXPORTS
 	length_KRB_PRIV
 	length_KRB_SAFE
 	length_KRB_SAFE_BODY
+	length_Kx509CSRPlus
+	length_Kx509ErrorCode
+	length_KX509_ERROR_CODE
+	length_Kx509Request
+	length_Kx509Response
 	length_LastReq
 	length_LR_TYPE
 	length_MessageDigest
@@ -1703,6 +1766,7 @@ EXPORTS
 	length_SignerIdentifier
 	length_SignerInfo
 	length_SignerInfos
+	length_SubjectInfoAccessSyntax
 	length_SubjectKeyIdentifier
 	length_SubjectPublicKeyInfo
 	length_TBSCertificate
@@ -1725,6 +1789,7 @@ EXPORTS
 	length_ValidationParms
 	length_Validity
 	length_Version
+	remove_AttributeValues
 	remove_AuthorizationData
 	remove_Certificates
 	remove_CRLDistributionPoints