diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-25 08:57:08 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-01-25 08:57:08 +0100 |
| commit | 65d9f5914de50516224f5634b9c672b2d4fdd083 (patch) | |
| tree | 25fdde03d661c7d8634d8cd8b136bf3c033bd8e4 | |
| parent | 96aae6d5dd034108b4a01e4403f6a765486651af (diff) | |
| parent | 143c3f55a913c01d78893331795331336be22d1f (diff) | |
| download | otp-65d9f5914de50516224f5634b9c672b2d4fdd083.tar.gz otp-65d9f5914de50516224f5634b9c672b2d4fdd083.tar.bz2 otp-65d9f5914de50516224f5634b9c672b2d4fdd083.zip | |
Merge branch 'ia/public_key/PKCS-10-usage-of-PKCS-9'
* ia/public_key/PKCS-10-usage-of-PKCS-9:
public_key: Include some PKCS-9 support needed by PKCS-10
| -rw-r--r-- | lib/public_key/asn1/PKCS-10.asn1 | 26 | ||||
| -rw-r--r-- | lib/public_key/doc/src/cert_records.xml | 9 |
2 files changed, 32 insertions, 3 deletions
diff --git a/lib/public_key/asn1/PKCS-10.asn1 b/lib/public_key/asn1/PKCS-10.asn1 index 333104d230..5ada81c257 100644 --- a/lib/public_key/asn1/PKCS-10.asn1 +++ b/lib/public_key/asn1/PKCS-10.asn1 @@ -20,12 +20,36 @@ IMPORTS ATTRIBUTE FROM InformationFramework informationFramework - Name + Name, Extensions, DirectoryString FROM PKIX1Explicit88 --InformationFramework informationFramework ALGORITHM FROM PKCS-7; --AuthenticationFramework authenticationFramework; +-- start inlined from PKCS-9 + +--pkcs-9-ub-pkcs9String INTEGER ::= 255 +--pkcs-9-ub-challengePassword INTEGER ::= pkcs-9-ub-pkcs9String +pkcs-9-at-challengePassword OBJECT IDENTIFIER ::= {pkcs-9 7} + +challengePassword ATTRIBUTE ::= { + WITH SYNTAX DirectoryString --{pkcs-9-ub-challengePassword} + SINGLE VALUE TRUE + ID pkcs-9-at-challengePassword +} + +pkcs-9-at-extensionRequest OBJECT IDENTIFIER ::= {pkcs-9 14} + +extensionRequest ATTRIBUTE ::= { + WITH SYNTAX ExtensionRequest + SINGLE VALUE TRUE + ID pkcs-9-at-extensionRequest +} + +ExtensionRequest ::= Extensions + +-- end inlined from PKCS-9 + -- Certificate requests CertificationRequestInfo ::= SEQUENCE { diff --git a/lib/public_key/doc/src/cert_records.xml b/lib/public_key/doc/src/cert_records.xml index f01f7dbaf5..ac4b4e4489 100644 --- a/lib/public_key/doc/src/cert_records.xml +++ b/lib/public_key/doc/src/cert_records.xml @@ -649,7 +649,7 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p> version atom(), subject {rdnSequence, [#AttributeTypeAndValue'{}]} , subjectPKInfo #'CertificationRequestInfo_subjectPKInfo'{}, - attributes [#AttributeTypeAndValue'{}] + attributes [#'AttributePKCS-10' {}] } #'CertificationRequestInfo_subjectPKInfo'{ @@ -665,7 +665,12 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p> #'CertificationRequest_signatureAlgorithm'{ algorithm = oid(), parameters = der_encoded() - } + } + +#'AttributePKCS-10'{ + type = oid(), + values = [der_encoded()] +} </code> </section> |