diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:26:54 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:26:54 +0100 |
| commit | 94e3d2d216b843a2f3e7187e3f972ebbe3134eba (patch) | |
| tree | fe7d2e7b42fcb08d286260228f9c0af221fbf311 /lib/public_key/doc/src/public_key.xml | |
| parent | 180ceb2f7b138f34443d76fe1c99514e4adc6a84 (diff) | |
| parent | 9aa4de3c97b98974f32c2b8e07c971343faf3f13 (diff) | |
| download | otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.tar.gz otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.tar.bz2 otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.zip | |
Merge remote branch 'upstream/maint'
Diffstat (limited to 'lib/public_key/doc/src/public_key.xml')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 4 |
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> |