diff options
| author | Hans Nilsson <[email protected]> | 2017-03-13 12:20:40 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-03-13 12:20:40 +0100 |
| commit | 47e46069d01960b74cefeba648e98e6afbb79e59 (patch) | |
| tree | 30edfafd54887a3ebb5eb814c298d91bcc89c7f7 /lib/public_key/doc | |
| parent | ee1ad99648316f4dc15d872804dfa52990e0240f (diff) | |
| parent | 72e126aa74b9632068d11f14f423b044a345f03f (diff) | |
| download | otp-47e46069d01960b74cefeba648e98e6afbb79e59.tar.gz otp-47e46069d01960b74cefeba648e98e6afbb79e59.tar.bz2 otp-47e46069d01960b74cefeba648e98e6afbb79e59.zip | |
Merge branch 'wiml/crypto/rsa-generate-key/ERL-165/PR-1299/OTP-14140'
Diffstat (limited to 'lib/public_key/doc')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index c97ec361d1..2300ce3937 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -331,13 +331,16 @@ </func> <func> - <name>generate_key(Params) -> {Public::binary(), Private::binary()} | #'ECPrivateKey'{} </name> + <name>generate_key(Params) -> {Public::binary(), Private::binary()} | #'ECPrivateKey'{} | {#'RSAPublicKey'{}, #'RSAPrivateKey'{}}</name> <fsummary>Generates a new keypair.</fsummary> <type> - <v>Params = #'DHParameter'{} | {namedCurve, oid()} | #'ECParameters'{}</v> + <v>Params = #'DHParameter'{} | {namedCurve, oid()} | #'ECParameters'{} + | {rsa, Size::integer(), PubExp::integer} </v> </type> <desc> - <p>Generates a new keypair.</p> + <p>Generates a new keypair. See also + <seealso marker="crypto:crypto#generate_key/2">crypto:generate_key/2</seealso> + </p> </desc> </func> |