Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_asn1/lib/pkcs12Templates.c b/OSX/libsecurity_asn1/lib/pkcs12Templates.c
index c9effec0a4b41ff43b6be44d4221cf1c3ca2457d..53600bc6bf2291ccbfa425ac4ed84767a5a8b816 100644 (file)
--- a/OSX/libsecurity_asn1/lib/pkcs12Templates.c
+++ b/OSX/libsecurity_asn1/lib/pkcs12Templates.c
@@ -99,7 +99,8 @@ const SecAsn1Template NSS_P12_PtrToShroudedKeyBagTemplate[] = {
 static const SecAsn1Template * NSS_P12_CertBagChooser(
        void *arg,                      // --> NSS_P12_CertBag
        Boolean enc,
 static const SecAsn1Template * NSS_P12_CertBagChooser(
        void *arg,                      // --> NSS_P12_CertBag
        Boolean enc,

-       const char *buf,        // on decode, tag byte
+       const char *buf,        // on decode, tag byte and length
+       size_t len,

        void *dest)                     // --> NSS_P12_CertBag.bagValue
 {
        NSS_P12_CertBag *bag = (NSS_P12_CertBag *)arg;
        void *dest)                     // --> NSS_P12_CertBag.bagValue
 {
        NSS_P12_CertBag *bag = (NSS_P12_CertBag *)arg;


@@ -152,7 +153,8 @@ const SecAsn1Template NSS_P12_PtrToCertBagTemplate[] = {
 static const SecAsn1Template * NSS_P12_CrlBagChooser(
        void *arg,                      // --> NSS_P12_CrlBag
        Boolean enc,
 static const SecAsn1Template * NSS_P12_CrlBagChooser(
        void *arg,                      // --> NSS_P12_CrlBag
        Boolean enc,

-       const char *buf,        // on decode, tag byte
+       const char *buf,        // on decode, tag byte and length
+       size_t len,

        void *dest)                     // --> NSS_P12_CertBag.bagValue
 {
        NSS_P12_CrlBag *bag = (NSS_P12_CrlBag *)arg;
        void *dest)                     // --> NSS_P12_CertBag.bagValue
 {
        NSS_P12_CrlBag *bag = (NSS_P12_CrlBag *)arg;


@@ -208,7 +210,8 @@ const SecAsn1Template NSS_P12_PtrToCrlBagTemplate[] = {
 static const SecAsn1Template * NSS_P12_SafeBagChooser(
        void *arg,                      // --> NSS_P12_SafeBag
        Boolean enc,
 static const SecAsn1Template * NSS_P12_SafeBagChooser(
        void *arg,                      // --> NSS_P12_SafeBag
        Boolean enc,

-       const char *buf,        // on decode, tag byte
+       const char *buf,        // on decode, tag byte and len
+       size_t len,

        void *dest)                     // --> NSS_P12_SafeBag.bagValue
 {
        NSS_P12_SafeBag *bag = (NSS_P12_SafeBag *)arg;
        void *dest)                     // --> NSS_P12_SafeBag.bagValue
 {
        NSS_P12_SafeBag *bag = (NSS_P12_SafeBag *)arg;