From c3bf2d966bd75084c8a323690432a1ea8a671cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 23 Jul 2005 11:08:47 +0000 Subject: [PATCH] add PKCS12-OctetString git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15715 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/asn1/Makefile.am | 3 ++- lib/asn1/pkcs12.asn1 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am index 2a45e0707..74ef2be33 100644 --- a/lib/asn1/Makefile.am +++ b/lib/asn1/Makefile.am @@ -284,9 +284,10 @@ gen_files_pkcs12 = \ asn1_PKCS12_AuthenticatedSafe.x \ asn1_PKCS12_CertBag.x \ asn1_PKCS12_Attribute.x \ - asn1_PKCS12_Attributes.x \ + asn1_PKCS12_Attributes.x \ asn1_PKCS12_SafeBag.x \ asn1_PKCS12_SafeContents.x \ + asn1_PKCS12_OctetString.x \ asn1_PKCS12_PBEParams.x gen_files_pkcs8 = \ diff --git a/lib/asn1/pkcs12.asn1 b/lib/asn1/pkcs12.asn1 index 20913c53e..4d6454a08 100644 --- a/lib/asn1/pkcs12.asn1 +++ b/lib/asn1/pkcs12.asn1 @@ -73,6 +73,8 @@ PKCS12-PBEParams ::= SEQUENCE { iterations INTEGER (0..4294967295) OPTIONAL } +PKCS12-OctetString ::= OCTET STRING + -- KeyBag ::= PrivateKeyInfo -- PKCS8ShroudedKeyBag ::= EncryptedPrivateKeyInfo