From 36c6ff407eed28d63af5478d43f37e85138f803e Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Thu, 11 Mar 2021 09:56:21 -0600
Subject: [PATCH] asn1: Fix Windows build harder

---
 lib/asn1/NTMakefile          | 16 +---------------
 lib/asn1/libasn1-exports.def | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/lib/asn1/NTMakefile b/lib/asn1/NTMakefile
index 762646847..fe4ff2da4 100644
--- a/lib/asn1/NTMakefile
+++ b/lib/asn1/NTMakefile
@@ -61,8 +61,6 @@ gen_files_test		= $(OBJ)\asn1_test_asn1.x
 
 gen_files_test_template	= $(OBJ)\asn1_test_template_asn1.x
 
-gen_files_x690sample_template	= $(OBJ)\asn1_x690sample_template_asn1.x
-
 gen_files_digest	= $(OBJ)\asn1_digest_asn1.x
 
 gen_files_kx509		= $(OBJ)\asn1_kx509_asn1.x
@@ -198,8 +196,6 @@ $(gen_files_test:.x=.c)	    : $$(@R).x
 
 $(gen_files_test_template:.x=.c)	    : $$(@R).x
 
-$(gen_files_x690sample_template:.x=.c)	    : $$(@R).x
-
 $(gen_files_krb5) $(OBJ)\krb5_asn1.hx: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5.opt
 	cd $(OBJ)
 	$(BINDIR)\asn1_compile.exe \
@@ -333,15 +329,6 @@ $(gen_files_test_template) $(OBJ)\test_template_asn1.hx: $(BINDIR)\asn1_compile.
 	|| ($(RM) $(OBJ)\test_template_asn1.h ; exit /b 1)
 	cd $(SRCDIR)
 
-$(gen_files_x690sample_template) $(OBJ)\x690sample_template_asn1.hx: $(BINDIR)\asn1_compile.exe x690sample.asn1
-	cd $(OBJ)
-	$(BINDIR)\asn1_compile.exe \
-		--template	\
-		--one-code-file --template \
-		$(SRCDIR)\x690sample.asn1 x690sample_template_asn1 \
-	|| ($(RM) $(OBJ)\x690sample_template_asn1.h ; exit /b 1)
-	cd $(SRCDIR)
-
 INCFILES=			    \
 	$(INCDIR)\der.h		    \
 	$(INCDIR)\heim_asn1.h	    \
@@ -463,8 +450,7 @@ $(OBJ)\check-der.exe: $(OBJ)\check-der.obj $(OBJ)\check-common.obj \
 	$(EXEPREP_NODIST)
 
 $(OBJ)\check-gen-template.exe: $(OBJ)\check-gen.obj $(OBJ)\check-common.obj \
-		$(LIBHEIMDAL) $(LIBROKEN) $(gen_files_test_template:.x=.obj) \
-		$(gen_files_x690sample_template:.x=.obj)
+		$(LIBHEIMDAL) $(LIBROKEN) $(gen_files_test_template:.x=.obj)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
diff --git a/lib/asn1/libasn1-exports.def b/lib/asn1/libasn1-exports.def
index 2de8b74d0..d4b395a8a 100644
--- a/lib/asn1/libasn1-exports.def
+++ b/lib/asn1/libasn1-exports.def
@@ -634,6 +634,11 @@ EXPORTS
 	copy_X520OrganizationalUnitName
 	copy_X520OrganizationName
 	copy_X520StateOrProvinceName
+	copy_X690SampleChildInformation
+	copy_X690SampleDate
+	copy_X690SampleEmployeeNumber
+	copy_X690SampleName
+	copy_X690SamplePersonnelRecord
 	decode_AccessDescription
 	decode_AD_AND_OR
 	decode_AD_IF_RELEVANT
@@ -990,6 +995,11 @@ EXPORTS
 	decode_X520OrganizationalUnitName
 	decode_X520OrganizationName
 	decode_X520StateOrProvinceName
+	decode_X690SampleChildInformation
+	decode_X690SampleDate
+	decode_X690SampleEmployeeNumber
+	decode_X690SampleName
+	decode_X690SamplePersonnelRecord
 	der_copy_bit_string
 	der_copy_bmp_string
 	der_copy_generalized_time
@@ -1492,6 +1502,11 @@ EXPORTS
 	encode_X520OrganizationalUnitName
 	encode_X520OrganizationName
 	encode_X520StateOrProvinceName
+	encode_X690SampleChildInformation
+	encode_X690SampleDate
+	encode_X690SampleEmployeeNumber
+	encode_X690SampleName
+	encode_X690SamplePersonnelRecord
 	FastOptions2int
 	free_AccessDescription
 	free_AD_AND_OR
@@ -1849,6 +1864,11 @@ EXPORTS
 	free_X520OrganizationalUnitName
 	free_X520OrganizationName
 	free_X520StateOrProvinceName
+	free_X690SampleChildInformation
+	free_X690SampleDate
+	free_X690SampleEmployeeNumber
+	free_X690SampleName
+	free_X690SamplePersonnelRecord
 	heim_any_cmp
 	HEIM_ANY_cmp
 	_heim_der_set_sort
@@ -2225,6 +2245,11 @@ EXPORTS
 	length_X520OrganizationalUnitName
 	length_X520OrganizationName
 	length_X520StateOrProvinceName
+	length_X690SampleChildInformation
+	length_X690SampleDate
+	length_X690SampleEmployeeNumber
+	length_X690SampleName
+	length_X690SamplePersonnelRecord
 	print_AccessDescription
 	print_AD_AND_OR
 	print_AD_IF_RELEVANT
@@ -2581,6 +2606,11 @@ EXPORTS
 	print_X520OrganizationalUnitName
 	print_X520OrganizationName
 	print_X520StateOrProvinceName
+	print_X690SampleChildInformation
+	print_X690SampleDate
+	print_X690SampleEmployeeNumber
+	print_X690SampleName
+	print_X690SamplePersonnelRecord
 	remove_AttributeValues
 	remove_AuthorizationData
 	remove_CertificatePolicies