aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/doc/src/public_key.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-16 10:25:55 +0100
committerIngela Anderton Andin <[email protected]>2012-11-16 10:25:55 +0100
commit9aa4de3c97b98974f32c2b8e07c971343faf3f13 (patch)
tree19e1b2574a6d27f32c59a343049abfa1ebd41809 /lib/public_key/doc/src/public_key.xml
parent7a637b67d2c97ed682fb338f66ec9aabbf8d47c9 (diff)
parent1180643da5bedf3b3b50ef9c25c361c1c2be7316 (diff)
downloadotp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.tar.gz
otp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.tar.bz2
otp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.zip
Merge branch 'ia/public_key/Additional-PKCS-support/OTP-10509' into maint
* ia/public_key/Additional-PKCS-support/OTP-10509: Prepare for release public_key: Add PKCS-10 documentation and PKCS-7 test case public_key: Simplified PKCS-7 and PKCS-10 specs. public_key: Added PKCS-10 public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS. public_key: Add PKCS-7
Diffstat (limited to 'lib/public_key/doc/src/public_key.xml')
-rw-r--r--lib/public_key/doc/src/public_key.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 5c227557f2..2ec1fcff9d 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -34,7 +34,7 @@
<modulesummary> API module for public key infrastructure.</modulesummary>
<description>
<p>This module provides functions to handle public key infrastructure
- from RFC 5280 - X.509 certificates and some parts of the PKCS-standard.
+ from <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280</url>- X.509 certificates and some parts of the PKCS-standard.
</p>
</description>
@@ -61,7 +61,7 @@
<p><code>string = [bytes()]</code></p>
<p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
- 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'| 'PrivateKeyInfo'</code></p>
+ 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'| 'PrivateKeyInfo' | 'CertificationRequest'</code></p>
<p><code>pem_entry () = {pki_asn1_type(), binary(), %% DER or encrypted DER
not_encrypted | cipher_info()} </code></p>