diff options
| author | Zandra Hird <[email protected]> | 2015-07-09 10:40:06 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-07-09 10:40:06 +0200 |
| commit | 46e36470195f6015ec2253244a22c782140700a4 (patch) | |
| tree | 8ba89b146be8d2f16d33f2b23bb883cb15567ad1 /lib | |
| parent | 859428cc405e3000c625a6c44a80bd3b22ad113d (diff) | |
| parent | 9356c4b37709b236c076f95fe26637fc332a3b3d (diff) | |
| download | otp-46e36470195f6015ec2253244a22c782140700a4.tar.gz otp-46e36470195f6015ec2253244a22c782140700a4.tar.bz2 otp-46e36470195f6015ec2253244a22c782140700a4.zip | |
Merge branch 'redvers/public_key_docfix' into maint
* redvers/public_key_docfix:
Updated documentation to match implementation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 394fe54428..209de2bdf7 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -108,8 +108,9 @@ <p><c>| 'SubjectPublicKeyInfo'</c></p> <p><c>| 'PrivateKeyInfo'</c></p> <p><c>| 'CertificationRequest'</c></p> + <p><c>| 'CertificateList'</c></p> <p><c>| 'ECPrivateKey'</c></p> - <p><c>| 'EcpkParameters'</c></p> + <p><c>| 'EcpkParameters'</c></p> </item> <tag><c>pem_entry () =</c></tag> @@ -433,7 +434,7 @@ <name>pkix_is_issuer(Cert, IssuerCert) -> boolean()</name> <fsummary>Checks if <c>IssuerCert</c> issued <c>Cert</c>.</fsummary> <type> - <v>Cert = der_encoded() | #'OTPCertificate'{}</v> + <v>Cert = der_encoded() | #'OTPCertificate'{} | #'CertificateList'{}</v> <v>IssuerCert = der_encoded() | #'OTPCertificate'{}</v> </type> <desc> @@ -698,7 +699,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{}, <name>pkix_sign(#'OTPTBSCertificate'{}, Key) -> der_encoded()</name> <fsummary>Signs certificate.</fsummary> <type> - <v>Key = rsa_public_key() | dsa_public_key()</v> + <v>Key = rsa_private_key() | dsa_private_key()</v> </type> <desc> <p>Signs an 'OTPTBSCertificate'. Returns the corresponding @@ -713,7 +714,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{}, <v>AlgorithmId = oid()</v> <d>Signature OID from a certificate or a certificate revocation list.</d> <v>DigestType = rsa_digest_type() | dss_digest_type()</v> - <v>SignatureType = rsa | dsa</v> + <v>SignatureType = rsa | dsa | ecdsa</v> </type> <desc> <p>Translates signature algorithm OID to Erlang digest and signature types. @@ -726,7 +727,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{}, <fsummary>Verifies PKIX x.509 certificate signature.</fsummary> <type> <v>Cert = der_encoded()</v> - <v>Key = rsa_public_key() | dsa_public_key()</v> + <v>Key = rsa_public_key() | dsa_public_key() | ec_public_key()</v> </type> <desc> <p>Verifies PKIX x.509 certificate signature.</p> |