aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/doc/src/public_key.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-15 16:28:32 +0100
committerIngela Anderton Andin <[email protected]>2012-11-16 10:03:05 +0100
commit7a9b5514b88923ae342a2bf140a534244791a6ff (patch)
tree076bd5aa49fc08731563bf278f22bfe762d9429d /lib/public_key/doc/src/public_key.xml
parentdbf18b8a7713d76c0be307af40e97cd7c564aa53 (diff)
downloadotp-7a9b5514b88923ae342a2bf140a534244791a6ff.tar.gz
otp-7a9b5514b88923ae342a2bf140a534244791a6ff.tar.bz2
otp-7a9b5514b88923ae342a2bf140a534244791a6ff.zip
public_key: Add PKCS-10 documentation and PKCS-7 test case
Note that PKCS-7 is an undocumented feature for now. Also added some minor enhancements to the documentation.
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>