aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-03-16 10:03:53 +0100
committerIngela Anderton Andin <[email protected]>2016-03-16 10:03:53 +0100
commitcee5b753e8dbd294b2677f684c404d16dcfcd643 (patch)
tree3636afffae2c3fe65b47e146ec66f06eafaefd68 /lib/public_key/doc
parent12c3609f15dbe367684ecb506b61f07c15205c51 (diff)
parent2102dcca65b21de96f983aa8549a539503253c2b (diff)
downloadotp-cee5b753e8dbd294b2677f684c404d16dcfcd643.tar.gz
otp-cee5b753e8dbd294b2677f684c404d16dcfcd643.tar.bz2
otp-cee5b753e8dbd294b2677f684c404d16dcfcd643.zip
Merge branch 'ia/public_key/EC-public_key/OTP-13408'
* ia/public_key/EC-public_key/OTP-13408: public_key: Handle PEM encoded EC public keys
Diffstat (limited to 'lib/public_key/doc')
-rw-r--r--lib/public_key/doc/src/public_key.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 16a7497a22..6923066da7 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -141,7 +141,7 @@
<item><p><c>#'DSAPrivateKey'{}</c></p></item>
<tag><c>ec_public_key()</c></tag>
- <item><p>= <c>{#'ECPoint'{}, #'EcpkParameters'{} | {namedCurve, oid()}}</c></p></item>
+ <item><p>= <c>{#'ECPoint'{}, #'ECParameters'{} | {namedCurve, oid()}}</c></p></item>
<tag><c>ec_private_key() =</c></tag>
<item><p><c>#'ECPrivateKey'{}</c></p></item>
@@ -418,13 +418,14 @@
<v>Entity = term()</v>
<d>Erlang representation of
<c>Asn1Type</c>. If <c>Asn1Type</c> is 'SubjectPublicKeyInfo',
- <c>Entity</c> must be either an <c>rsa_public_key()</c> or a
- <c>dsa_public_key()</c> and this function creates the appropriate
+ <c>Entity</c> must be either an <c>rsa_public_key()</c>,
+ <c>dsa_public_key()</c> or an <c>ec_public_key()</c>
+ and this function creates the appropriate
'SubjectPublicKeyInfo' entry.
</d>
<v>CipherInfo = cipher_info()</v>
<v>Password = string()</v>
- </type>
+ </type>
<desc>
<p>Creates a PEM entry that can be feed to <c>pem_encode/1</c>.</p>
</desc>