From a0ee04b78e4bf5af89515d584d24aeae80bb8a40 Mon Sep 17 00:00:00 2001
From: Blake Ramsdell <blaker@gmail.com>
Date: Fri, 21 Dec 2007 17:45:01 -0800
Subject: [PATCH] Upgraded to a2c-v6. rfc3280a.asn is gone now, replaced by
 pkix-common.asn, and the extensions in a certificate is now an anonymous
 structure.

---
 printcert/Makefile    |  4 ++--
 printcert/printcert.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/printcert/Makefile b/printcert/Makefile
index acdb21c..19a347f 100644
--- a/printcert/Makefile
+++ b/printcert/Makefile
@@ -4,8 +4,8 @@ CFLAGS=$(IARG)
 
 all: check
 
-rfc3280.c: $(PATH_TO_A2C)/a2c.exe $(PATH_TO_A2C)/test/rfc3280.asn $(PATH_TO_A2C)/test/rfc3280a.asn
-	mono $(PATH_TO_A2C)/a2c.exe -inline=static -out=rfc3280 $(PATH_TO_A2C)/test/rfc3280.asn $(PATH_TO_A2C)/test/rfc3280a.asn
+rfc3280.c: $(PATH_TO_A2C)/a2c.exe $(PATH_TO_A2C)/test/rfc3280.asn $(PATH_TO_A2C)/test/pkix-common.asn
+	mono $(PATH_TO_A2C)/a2c.exe -inline=static -out=rfc3280 $(PATH_TO_A2C)/test/rfc3280.asn $(PATH_TO_A2C)/test/pkix-common.asn
 
 printcert: printcert.c util.c rfc3280.c $(A2C_LIB)
 
diff --git a/printcert/printcert.c b/printcert/printcert.c
index bdb8a87..1c557e3 100644
--- a/printcert/printcert.c
+++ b/printcert/printcert.c
@@ -34,13 +34,13 @@ static void print_name_email_addresses(Cert_Name* name)
     }
 }
 
-static void print_subject_alt_name_email_addresses(Cert_Extensions* extensions)
+static void print_subject_alt_name_email_addresses(Cert_Certificate* certificate)
 {
     int counter = 0;
     
-    for (counter = 0;counter < extensions->count;++counter)
+    for (counter = 0;counter < certificate->toBeSigned.extensions.count;++counter)
     {
-        if (_A2C_OIDS_EQUAL(&extensions->array[counter].extnID, &CertImpl_id_ce_subjectAltName))
+        if (_A2C_OIDS_EQUAL(&certificate->toBeSigned.extensions.array[counter].extnID, &CertImpl_id_ce_subjectAltName))
         {
             CertImpl_GeneralNames* names = NULL;
             A2C_ERROR err = A2C_ERROR_Success;
@@ -51,8 +51,8 @@ static void print_subject_alt_name_email_addresses(Cert_Extensions* extensions)
                 &CertImpl_GeneralNames_descriptor,
                 0,
                 NULL,
-                extensions->array[counter].extnValue.data,
-                extensions->array[counter].extnValue.length
+                certificate->toBeSigned.extensions.array[counter].extnValue.data,
+                certificate->toBeSigned.extensions.array[counter].extnValue.length
                 );
             if (err < A2C_ERROR_Success)
             {
@@ -80,6 +80,6 @@ int main(int argc, char** argv)
     if (certificate != NULL)
     {
         print_name_email_addresses(&certificate->toBeSigned.subject);
-        print_subject_alt_name_email_addresses(&certificate->toBeSigned.extensions);
+        print_subject_alt_name_email_addresses(certificate);
     }
 }
-- 
2.11.4.GIT