Corrections made to the ASN.1 modules of X.420 (06/1999)

. Module IPMSMessageStopreAttributes

  Replacement of all occurences of " ATTRIBUTE " with " X413ATTRIBUTE "

This class was renamed in X.413 module "MSAbstractService".

. Module PKCS7

1. Replacement of all occurences of "HASHED" with "HASH"

2. Replacement of:

Digest ::= HASHED { CHOICE {
	content				PKCS7-CONTENT-TYPE.&Type ({PKCS7ContentTable}), 
	authenticated-attributes 	[0] EXPLICIT Attributes } }

With:

Digest ::= HASH { CHOICE {
	content				[1]  PKCS7-CONTENT-TYPE.&Type ({PKCS7ContentTable}), 
	authenticated-attributes 	[0] EXPLICIT Attributes } }

3. Replacement of

EncryptedContentInfo ::= SEQUENCE {
	contentType 			PKCS7-CONTENT-TYPE.&id ({PKCS7ContentTable}),
	contentEncryptionAlgorithm 	ContentEncryptionAlgorithmIdentifier,
	encryptedContent 		[0] ENCRYPTED { PKCS7-CONTENT-TYPE.&Type 
			({PKCS7ContentTable} {@contentType}) } OPTIONAL }

With:

EncryptedContentInfo ::= SEQUENCE {
	contentType 			PKCS7-CONTENT-TYPE.&id ({PKCS7ContentTable}),
	contentEncryptionAlgorithm 	ContentEncryptionAlgorithmIdentifier,
	encryptedContent 		[0] ENCRYPTED { PKCS7-CONTENT-TYPE.&Type 
			({PKCS7ContentTable} {@.contentType}) } OPTIONAL }

4. Replacement of

DigestedData ::= SEQUENCE {
	version 	Version,
	digestAlgorithm DigestAlgorithmIdentifier,
	contentInfo 	ContentInfo,
	digest 		HASHED { PKCS7-CONTENT-TYPE.&Type ({PKCS7ContentTable} {@contentInfo.content-type})}}

With:

DigestedData ::= SEQUENCE {
	version 	Version,
	digestAlgorithm DigestAlgorithmIdentifier,
	contentInfo 	ContentInfo,
	digest 		HASH { PKCS7-CONTENT-TYPE.&Type ({PKCS7ContentTable} ) } }