Renamed all of the PKCS #xx stuff names, to pkcs-x-name.

8 files changed, 113 insertions, 113 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index bd44cdbb27..8807bcbfac 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -49,7 +49,7 @@ libgnutls_la_SOURCES = $(COBJECTS)
 libgnutls_la_LIBADD = $(MINITASN1_OBJECTS) x509/dn.lo x509/crl.lo x509/common.lo \
 	x509/x509.lo x509/extensions.lo x509/compat.lo x509/verify.lo \
 	x509/mpi.lo x509/privkey.lo x509/pkcs7.lo x509/crq.lo x509/xml.lo x509/sign.lo \
-	x509/pkcs5.lo x509/privkey_pkcs8.lo
+	x509/pkcs5.lo x509/privkey_pkcs8.lo x509/pkcs12.lo
 
 libgnutls_la_LDFLAGS = $(LIBASN1_LINK) $(LIBGCRYPT_LIBS) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 4ff2a93f56..215c781329 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -134,7 +134,7 @@ static gnutls_error_entry error_algorithms[] = {
         ERROR_ENTRY("The OpenPGP fingerprint is not supported.", GNUTLS_E_OPENPGP_FINGERPRINT_UNSUPPORTED, 1),
         ERROR_ENTRY("The certificate has unsupported attributes.", GNUTLS_E_X509_UNSUPPORTED_ATTRIBUTE, 1),
         ERROR_ENTRY("The hash algorithm is unknown.", GNUTLS_E_UNKNOWN_HASH_ALGORITHM, 1),
-        ERROR_ENTRY("The PKCS7 structure's content type is unknown.", GNUTLS_E_UNKNOWN_PKCS7_CONTENT_TYPE, 1),
+        ERROR_ENTRY("The PKCS structure's content type is unknown.", GNUTLS_E_UNKNOWN_PKCS_CONTENT_TYPE, 1),
 	{0, 0, 0, 0}
 };
 
diff --git a/lib/gnutls_errors_int.h b/lib/gnutls_errors_int.h
index 51552af11f..eec286bcce 100644
--- a/lib/gnutls_errors_int.h
+++ b/lib/gnutls_errors_int.h
@@ -110,7 +110,7 @@
 #define GNUTLS_E_OPENPGP_FINGERPRINT_UNSUPPORTED -94
 #define GNUTLS_E_X509_UNSUPPORTED_ATTRIBUTE -95
 #define GNUTLS_E_UNKNOWN_HASH_ALGORITHM -96
-#define GNUTLS_E_UNKNOWN_PKCS7_CONTENT_TYPE -97
+#define GNUTLS_E_UNKNOWN_PKCS_CONTENT_TYPE -97
 
 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -250
 
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index b8e75d5a10..f513080b85 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1032,7 +1032,7 @@ static int parse_pem_ca_mem( gnutls_x509_crt** cert_list, int* ncerts,
 		
 		tmp.data = (char*)ptr;
 		tmp.size = size;
-	
+
 		ret =
 		     gnutls_x509_crt_import(
 				     cert_list[0][i - 1],
diff --git a/lib/pkix.asn b/lib/pkix.asn
index c74bd4702c..5fec374d6d 100644
--- a/lib/pkix.asn
+++ b/lib/pkix.asn
@@ -948,52 +948,52 @@ ub-x121-address-length INTEGER ::= 16
 
 -- Cryptographic Message Syntax
 
-ContentInfo ::= SEQUENCE {
-  contentType ContentType,
+pkcs-7-ContentInfo ::= SEQUENCE {
+  contentType pkcs-7-ContentType,
   content [0] EXPLICIT ANY DEFINED BY contentType }
 
-ContentType ::= OBJECT IDENTIFIER
+pkcs-7-ContentType ::= OBJECT IDENTIFIER
 
-SignedData ::= SEQUENCE {
-  version CMSVersion,
-  digestAlgorithms DigestAlgorithmIdentifiers,
-  encapContentInfo EncapsulatedContentInfo,
-  certificates [0] IMPLICIT CertificateSet OPTIONAL,
-  crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
-  signerInfos SignerInfos 
+pkcs-7-SignedData ::= SEQUENCE {
+  version pkcs-7-CMSVersion,
+  digestAlgorithms pkcs-7-DigestAlgorithmIdentifiers,
+  encapContentInfo pkcs-7-EncapsulatedContentInfo,
+  certificates [0] IMPLICIT pkcs-7-CertificateSet OPTIONAL,
+  crls [1] IMPLICIT pkcs-7-CertificateRevocationLists OPTIONAL,
+  signerInfos pkcs-7-SignerInfos 
 }
 
-CMSVersion ::= INTEGER  { v0(0), v1(1), v2(2), v3(3), v4(4) }
+pkcs-7-CMSVersion ::= INTEGER  { v0(0), v1(1), v2(2), v3(3), v4(4) }
 
-DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
+pkcs-7-DigestAlgorithmIdentifiers ::= SET OF pkcs-7-DigestAlgorithmIdentifier
 
-DigestAlgorithmIdentifier ::= AlgorithmIdentifier
+pkcs-7-DigestAlgorithmIdentifier ::= AlgorithmIdentifier
 
-EncapsulatedContentInfo ::= SEQUENCE {
-  eContentType ContentType,
+pkcs-7-EncapsulatedContentInfo ::= SEQUENCE {
+  eContentType pkcs-7-ContentType,
   eContent [0] EXPLICIT OCTET STRING OPTIONAL }
 
 -- We don't use CertificateList here since we only want
 -- to read the raw data.
-CertificateRevocationLists ::= SET OF ANY
+pkcs-7-CertificateRevocationLists ::= SET OF ANY
 
-CertificateChoices ::= CHOICE {
+pkcs-7-CertificateChoices ::= CHOICE {
 -- Although the paper uses Certificate type, we
 -- don't use it since, we don't need to parse it.
 -- We only need to read and store it.
   certificate ANY
 }
 
-CertificateSet ::= SET OF CertificateChoices
+pkcs-7-CertificateSet ::= SET OF pkcs-7-CertificateChoices
 
-SignerInfos ::= SET OF ANY -- this is not correct but we don't use it
+pkcs-7-SignerInfos ::= SET OF ANY -- this is not correct but we don't use it
  -- anyway
 
 
 -- BEGIN of RFC2986
 
 -- Certificate requests
-CertificationRequestInfo ::= SEQUENCE {
+pkcs-10-CertificationRequestInfo ::= SEQUENCE {
      version       INTEGER { v1(0) },
      subject       Name,
      subjectPKInfo SubjectPublicKeyInfo,
@@ -1002,8 +1002,8 @@ CertificationRequestInfo ::= SEQUENCE {
 
 Attributes ::= SET OF Attribute
 
-CertificationRequest ::= SEQUENCE {
-     certificationRequestInfo CertificationRequestInfo,
+pkcs-10-CertificationRequest ::= SEQUENCE {
+     certificationRequestInfo pkcs-10-CertificationRequestInfo,
      signatureAlgorithm AlgorithmIdentifier,
      signature          BIT STRING
 }
@@ -1015,9 +1015,9 @@ pkcs-9-ub-challengePassword   INTEGER ::= 255
 pkcs-9-certTypes OBJECT IDENTIFIER ::= {pkcs-9 22}
 pkcs-9-crlTypes OBJECT IDENTIFIER ::= {pkcs-9 23}
 
-challengePassword AttributeType	   ::= {pkcs-9 7}
+pkcs-9-challengePassword AttributeType	   ::= {pkcs-9 7}
 
-Pkcs9challengePassword        ::= CHOICE {
+pkcs-9-challengePassword        ::= CHOICE {
       printableString       PrintableString (SIZE (1..pkcs-9-ub-challengePassword)),
       utf8String            UTF8String (SIZE (1..pkcs-9-ub-challengePassword)) }
 
@@ -1090,7 +1090,7 @@ pkcs-12	OBJECT IDENTIFIER ::= {pkcs 12}
 
 pkcs-12-PFX ::= SEQUENCE {
     	version		INTEGER {v3(3)},
-    	authSafe	ContentInfo,
+    	authSafe	pkcs-7-ContentInfo,
     	macData    	pkcs-12-MacData OPTIONAL
 }
 
@@ -1104,7 +1104,7 @@ pkcs-12-MacData ::= ANY
 -- deprecated. A higher value, like 1024 is recommended.
 --}
 
-pkcs-12-AuthenticatedSafe ::= SEQUENCE OF ContentInfo
+pkcs-12-AuthenticatedSafe ::= SEQUENCE OF pkcs-7-ContentInfo
 	-- Data if unencrypted
 	-- EncryptedData if password-encrypted
 	-- EnvelopedData if public key-encrypted
@@ -1171,12 +1171,12 @@ pkcs-7-encryptedData OBJECT IDENTIFIER ::= { iso(1) member-body(2)
 pkcs-7-Data ::= OCTET STRING
 
 pkcs-7-EncryptedData ::= SEQUENCE {
-    version CMSVersion,
+    version pkcs-7-CMSVersion,
     encryptedContentInfo pkcs-7-EncryptedContentInfo,
     unprotectedAttrs [1] IMPLICIT pkcs-7-UnprotectedAttributes OPTIONAL }
 
 pkcs-7-EncryptedContentInfo ::= SEQUENCE {
-    contentType ContentType,
+    contentType pkcs-7-ContentType,
     contentEncryptionAlgorithm pkcs-7-ContentEncryptionAlgorithmIdentifier,
     encryptedContent [0] IMPLICIT pkcs-7-EncryptedContent OPTIONAL }
 
diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c
index b0e787d75d..28a4ed0c02 100644
--- a/lib/pkix_asn1_tab.c
+++ b/lib/pkix_asn1_tab.c
@@ -860,43 +860,43 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={
   {"ub-terminal-id-length",1342177283,"24"},
   {"ub-unformatted-address-length",1342177283,"180"},
   {"ub-x121-address-length",1342177283,"16"},
-  {"ContentInfo",1610612741,0},
-  {"contentType",1073741826,"ContentType"},
+  {"pkcs-7-ContentInfo",1610612741,0},
+  {"contentType",1073741826,"pkcs-7-ContentType"},
   {"content",541073421,0},
   {0,1073743880,"0"},
   {"contentType",1,0},
-  {"ContentType",1073741836,0},
-  {"SignedData",1610612741,0},
-  {"version",1073741826,"CMSVersion"},
-  {"digestAlgorithms",1073741826,"DigestAlgorithmIdentifiers"},
-  {"encapContentInfo",1073741826,"EncapsulatedContentInfo"},
-  {"certificates",1610637314,"CertificateSet"},
+  {"pkcs-7-ContentType",1073741836,0},
+  {"pkcs-7-SignedData",1610612741,0},
+  {"version",1073741826,"pkcs-7-CMSVersion"},
+  {"digestAlgorithms",1073741826,"pkcs-7-DigestAlgorithmIdentifiers"},
+  {"encapContentInfo",1073741826,"pkcs-7-EncapsulatedContentInfo"},
+  {"certificates",1610637314,"pkcs-7-CertificateSet"},
   {0,4104,"0"},
-  {"crls",1610637314,"CertificateRevocationLists"},
+  {"crls",1610637314,"pkcs-7-CertificateRevocationLists"},
   {0,4104,"1"},
-  {"signerInfos",2,"SignerInfos"},
-  {"CMSVersion",1610874883,0},
+  {"signerInfos",2,"pkcs-7-SignerInfos"},
+  {"pkcs-7-CMSVersion",1610874883,0},
   {"v0",1073741825,"0"},
   {"v1",1073741825,"1"},
   {"v2",1073741825,"2"},
   {"v3",1073741825,"3"},
   {"v4",1,"4"},
-  {"DigestAlgorithmIdentifiers",1610612751,0},
-  {0,2,"DigestAlgorithmIdentifier"},
-  {"DigestAlgorithmIdentifier",1073741826,"AlgorithmIdentifier"},
-  {"EncapsulatedContentInfo",1610612741,0},
-  {"eContentType",1073741826,"ContentType"},
+  {"pkcs-7-DigestAlgorithmIdentifiers",1610612751,0},
+  {0,2,"pkcs-7-DigestAlgorithmIdentifier"},
+  {"pkcs-7-DigestAlgorithmIdentifier",1073741826,"AlgorithmIdentifier"},
+  {"pkcs-7-EncapsulatedContentInfo",1610612741,0},
+  {"eContentType",1073741826,"pkcs-7-ContentType"},
   {"eContent",536895495,0},
   {0,2056,"0"},
-  {"CertificateRevocationLists",1610612751,0},
+  {"pkcs-7-CertificateRevocationLists",1610612751,0},
   {0,13,0},
-  {"CertificateChoices",1610612754,0},
+  {"pkcs-7-CertificateChoices",1610612754,0},
   {"certificate",13,0},
-  {"CertificateSet",1610612751,0},
-  {0,2,"CertificateChoices"},
-  {"SignerInfos",1610612751,0},
+  {"pkcs-7-CertificateSet",1610612751,0},
+  {0,2,"pkcs-7-CertificateChoices"},
+  {"pkcs-7-SignerInfos",1610612751,0},
   {0,13,0},
-  {"CertificationRequestInfo",1610612741,0},
+  {"pkcs-10-CertificationRequestInfo",1610612741,0},
   {"version",1610874883,0},
   {"v1",1,"0"},
   {"subject",1073741826,"Name"},
@@ -905,8 +905,8 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={
   {0,4104,"0"},
   {"Attributes",1610612751,0},
   {0,2,"Attribute"},
-  {"CertificationRequest",1610612741,0},
-  {"certificationRequestInfo",1073741826,"CertificationRequestInfo"},
+  {"pkcs-10-CertificationRequest",1610612741,0},
+  {"certificationRequestInfo",1073741826,"pkcs-10-CertificationRequestInfo"},
   {"signatureAlgorithm",1073741826,"AlgorithmIdentifier"},
   {"signature",6,0},
   {"pkcs-9-ub-challengePassword",1342177283,"255"},
@@ -916,29 +916,29 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={
   {"pkcs-9-crlTypes",1879048204,0},
   {0,1073741825,"pkcs-9"},
   {0,1,"23"},
-  {"challengePassword",1880096780,"AttributeType"},
+  {"pkcs-9-challengePassword",1880096780,"AttributeType"},
   {0,1073741825,"pkcs-9"},
   {0,1,"7"},
-  {"Pkcs9challengePassword",1610612754,0},
+  {"pkcs-9-challengePassword",1610612754,0},
   {"printableString",1612709890,"PrintableString"},
   {"pkcs-9-ub-challengePassword",524298,"1"},
   {"utf8String",538968066,"UTF8String"},
   {"pkcs-9-ub-challengePassword",524298,"1"},
-  {"PrivateKeyInfo",1610612741,0},
-  {"version",1073741826,"Version"},
+  {"pkcs-8-PrivateKeyInfo",1610612741,0},
+  {"version",1073741826,"pkcs-8-Version"},
   {"privateKeyAlgorithm",1073741826,"AlgorithmIdentifier"},
-  {"privateKey",1073741826,"PrivateKey"},
+  {"privateKey",1073741826,"pkcs-8-PrivateKey"},
   {"attributes",536895490,"Attributes"},
   {0,4104,"0"},
-  {"Version",1610874883,0},
+  {"pkcs-8-Version",1610874883,0},
   {"v1",1,"0"},
-  {"PrivateKey",1073741831,0},
-  {"Attributes",1610612751,0},
+  {"pkcs-8-PrivateKey",1073741831,0},
+  {"pkcs-8-Attributes",1610612751,0},
   {0,2,"Attribute"},
-  {"EncryptedPrivateKeyInfo",1610612741,0},
+  {"pkcs-8-EncryptedPrivateKeyInfo",1610612741,0},
   {"encryptionAlgorithm",1073741826,"AlgorithmIdentifier"},
-  {"encryptedData",2,"EncryptedData"},
-  {"EncryptedData",1073741831,0},
+  {"encryptedData",2,"pkcs-8-EncryptedData"},
+  {"pkcs-8-EncryptedData",1073741831,0},
   {"pkcs-5",1879048204,0},
   {0,1073741825,"pkcs"},
   {0,1,"5"},
@@ -974,58 +974,58 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={
   {"pkcs-12",1879048204,0},
   {0,1073741825,"pkcs"},
   {0,1,"12"},
-  {"PFX",1610612741,0},
+  {"pkcs-12-PFX",1610612741,0},
   {"version",1610874883,0},
   {"v3",1,"3"},
-  {"authSafe",1073741826,"ContentInfo"},
-  {"macData",16386,"MacData"},
-  {"MacData",1073741837,0},
-  {"AuthenticatedSafe",1610612747,0},
-  {0,2,"ContentInfo"},
-  {"SafeContents",1610612747,0},
-  {0,2,"SafeBag"},
-  {"BAG-TYPE",1610612741,0},
+  {"authSafe",1073741826,"pkcs-7-ContentInfo"},
+  {"macData",16386,"pkcs-12-MacData"},
+  {"pkcs-12-MacData",1073741837,0},
+  {"pkcs-12-AuthenticatedSafe",1610612747,0},
+  {0,2,"pkcs-7-ContentInfo"},
+  {"pkcs-12-SafeContents",1610612747,0},
+  {0,2,"pkcs-12-SafeBag"},
+  {"pkcs-12-BAG-TYPE",1610612741,0},
   {"type-id",1073741836,0},
   {"value",541073421,0},
   {0,1073743880,"0"},
   {"type-id",1,0},
-  {"SafeBag",1610612741,0},
-  {"bagId",1073741826,"BAG-TYPE"},
+  {"pkcs-12-SafeBag",1610612741,0},
+  {"bagId",1073741826,"pkcs-12-BAG-TYPE"},
   {"bagValue",1614815245,0},
   {0,1073743880,"0"},
   {"badId",1,0},
   {"bagAttributes",536887311,0},
-  {0,2,"PKCS12Attribute"},
-  {"bagtypes",1879048204,0},
+  {0,2,"pkcs-12-PKCS12Attribute"},
+  {"pkcs-12-bagtypes",1879048204,0},
   {0,1073741825,"pkcs-12"},
   {0,1073741825,"10"},
   {0,1,"1"},
-  {"keyBag",1879048204,0},
-  {0,1073741825,"bagtypes"},
+  {"pkcs-12-keyBag",1879048204,0},
+  {0,1073741825,"pkcs-12-bagtypes"},
   {0,1,"1"},
-  {"pkcs8ShroudedKeyBag",1879048204,0},
-  {0,1073741825,"bagtypes"},
+  {"pkcs-12-pkcs8ShroudedKeyBag",1879048204,0},
+  {0,1073741825,"pkcs-12-bagtypes"},
   {0,1,"2"},
-  {"certBag",1879048204,0},
-  {0,1073741825,"bagtypes"},
+  {"pkcs-12-certBag",1879048204,0},
+  {0,1073741825,"pkcs-12-bagtypes"},
   {0,1,"3"},
-  {"crlBag",1879048204,0},
-  {0,1073741825,"bagtypes"},
+  {"pkcs-12-crlBag",1879048204,0},
+  {0,1073741825,"pkcs-12-bagtypes"},
   {0,1,"4"},
-  {"KeyBag",1073741826,"PrivateKeyInfo"},
-  {"PKCS8ShroudedKeyBag",1073741826,"EncryptedPrivateKeyInfo"},
-  {"CertBag",1610612741,0},
-  {"certId",1073741826,"BAG-TYPE"},
+  {"pkcs-12-KeyBag",1073741826,"pkcs-8-PrivateKeyInfo"},
+  {"pkcs-12-PKCS8ShroudedKeyBag",1073741826,"pkcs-8-EncryptedPrivateKeyInfo"},
+  {"pkcs-12-CertBag",1610612741,0},
+  {"certId",1073741826,"pkcs-12-BAG-TYPE"},
   {"certValue",541073421,0},
   {0,1073743880,"0"},
   {"certId",1,0},
-  {"CRLBag",1610612741,0},
-  {"crlId",1073741826,"BAG-TYPE"},
+  {"pkcs-12-CRLBag",1610612741,0},
+  {"crlId",1073741826,"pkcs-12-BAG-TYPE"},
   {"crlValue",541073421,0},
   {0,1073743880,"0"},
   {"crlId",1,0},
-  {"PKCS12Attribute",1073741837,0},
-  {"id-data",1879048204,0},
+  {"pkcs-12-PKCS12Attribute",1073741837,0},
+  {"pkcs-7-data",1879048204,0},
   {"iso",1073741825,"1"},
   {"member-body",1073741825,"2"},
   {"us",1073741825,"840"},
@@ -1033,7 +1033,7 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={
   {"pkcs",1073741825,"1"},
   {"pkcs7",1073741825,"7"},
   {0,1,"1"},
-  {"id-encryptedData",1879048204,0},
+  {"pkcs-7-encryptedData",1879048204,0},
   {"iso",1073741825,"1"},
   {"member-body",1073741825,"2"},
   {"us",1073741825,"840"},
@@ -1041,20 +1041,20 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={
   {"pkcs",1073741825,"1"},
   {"pkcs7",1073741825,"7"},
   {0,1,"6"},
-  {"Data",1073741831,0},
-  {"EncryptedData",1610612741,0},
-  {"version",1073741826,"CMSVersion"},
-  {"encryptedContentInfo",1073741826,"EncryptedContentInfo"},
-  {"unprotectedAttrs",536895490,"UnprotectedAttributes"},
+  {"pkcs-7-Data",1073741831,0},
+  {"pkcs-7-EncryptedData",1610612741,0},
+  {"version",1073741826,"pkcs-7-CMSVersion"},
+  {"encryptedContentInfo",1073741826,"pkcs-7-EncryptedContentInfo"},
+  {"unprotectedAttrs",536895490,"pkcs-7-UnprotectedAttributes"},
   {0,4104,"1"},
-  {"EncryptedContentInfo",1610612741,0},
-  {"contentType",1073741826,"ContentType"},
-  {"contentEncryptionAlgorithm",1073741826,"ContentEncryptionAlgorithmIdentifier"},
-  {"encryptedContent",536895490,"EncryptedContent"},
+  {"pkcs-7-EncryptedContentInfo",1610612741,0},
+  {"contentType",1073741826,"pkcs-7-ContentType"},
+  {"contentEncryptionAlgorithm",1073741826,"pkcs-7-ContentEncryptionAlgorithmIdentifier"},
+  {"encryptedContent",536895490,"pkcs-7-EncryptedContent"},
   {0,4104,"0"},
-  {"ContentEncryptionAlgorithmIdentifier",1073741826,"AlgorithmIdentifier"},
-  {"EncryptedContent",1073741831,0},
-  {"UnprotectedAttributes",538968079,0},
+  {"pkcs-7-ContentEncryptionAlgorithmIdentifier",1073741826,"AlgorithmIdentifier"},
+  {"pkcs-7-EncryptedContent",1073741831,0},
+  {"pkcs-7-UnprotectedAttributes",538968079,0},
   {"MAX",1074266122,"1"},
   {0,2,"Attribute"},
   {0,0,0}
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index b41bf84317..2721d91c69 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -55,7 +55,7 @@ int gnutls_x509_crq_init(gnutls_x509_crq * crq)
 
 	if (*crq) {
 		int result = asn1_create_element(_gnutls_get_pkix(),
-				     "PKIX1.CertificationRequest",
+				     "PKIX1.pkcs-10-CertificationRequest",
 				     &((*crq)->crq));
 		if (result != ASN1_SUCCESS) {
 			gnutls_assert();
diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 78f0ad6751..d56ccf5e84 100644
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -63,7 +63,7 @@ int tmp_size, len, result;
 	}
 
 	if ((result=asn1_create_element
-	    (_gnutls_get_pkix(), "PKIX1.SignedData", &c2)) != ASN1_SUCCESS) {
+	    (_gnutls_get_pkix(), "PKIX1.pkcs-7-SignedData", &c2)) != ASN1_SUCCESS) {
 		gnutls_assert();
 		return _gnutls_asn2err(result);
 	}
@@ -141,7 +141,7 @@ int gnutls_pkcs7_init(gnutls_pkcs7 * pkcs7)
 
 	if (*pkcs7) {
 		int result = asn1_create_element(_gnutls_get_pkix(),
-				     "PKIX1.ContentInfo",
+				     "PKIX1.pkcs-7-ContentInfo",
 				     &(*pkcs7)->pkcs7);
 		if (result != ASN1_SUCCESS) {
 			gnutls_assert();
@@ -395,7 +395,7 @@ static int create_empty_signed_data(ASN1_TYPE pkcs7, ASN1_TYPE * sdata)
 	*sdata = ASN1_TYPE_EMPTY;
 
 	if ((result=asn1_create_element
-	    (_gnutls_get_pkix(), "PKIX1.SignedData", sdata)) != ASN1_SUCCESS) {
+	    (_gnutls_get_pkix(), "PKIX1.pkcs-7-SignedData", sdata)) != ASN1_SUCCESS) {
 		gnutls_assert();
 		result = _gnutls_asn2err(result);
 		goto cleanup;