Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_asn1 / lib / X509Templates.c

diff --git a/OSX/libsecurity_asn1/lib/X509Templates.c b/OSX/libsecurity_asn1/lib/X509Templates.c
index 4677b4eeaeb0288054cf97e2ca77ee0488808084..93dda3e7ae9994421e5edc8699dae455ab4668f8 100644 (file)
--- a/OSX/libsecurity_asn1/lib/X509Templates.c
+++ b/OSX/libsecurity_asn1/lib/X509Templates.c
@@ -45,9 +45,10 @@ static const SecAsn1Template * NSS_TimeChooser(
        void *arg, 
        Boolean enc,
        const char *buf,
        void *arg, 
        Boolean enc,
        const char *buf,

+       size_t len,

        void *dest)
 {
        void *dest)
 {

-       return SecAsn1TaggedTemplateChooser(arg, enc, buf, dest, timeChoices);
+       return SecAsn1TaggedTemplateChooser(arg, enc, buf, len, dest, timeChoices);

 }
 
 static const SecAsn1TemplateChooserPtr NSS_TimeChooserPtr = NSS_TimeChooser;
 }
 
 static const SecAsn1TemplateChooserPtr NSS_TimeChooserPtr = NSS_TimeChooser;


@@ -110,10 +111,10 @@ const SecAsn1Template kSecAsn1TBSCertificateTemplate[] = {
     { SEC_ASN1_INLINE,
          offsetof(NSS_TBSCertificate,subjectPublicKeyInfo),
          kSecAsn1SubjectPublicKeyInfoTemplate },
     { SEC_ASN1_INLINE,
          offsetof(NSS_TBSCertificate,subjectPublicKeyInfo),
          kSecAsn1SubjectPublicKeyInfoTemplate },

-    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 1,
+    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | 1,

          offsetof(NSS_TBSCertificate,issuerID),
          kSecAsn1BitStringTemplate },
          offsetof(NSS_TBSCertificate,issuerID),
          kSecAsn1BitStringTemplate },

-    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 2,
+    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | 2,

          offsetof(NSS_TBSCertificate,subjectID),
          kSecAsn1BitStringTemplate },
     { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 
          offsetof(NSS_TBSCertificate,subjectID),
          kSecAsn1BitStringTemplate },
     { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC |