diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-12 11:07:03 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-12 11:07:03 +0200 |
| commit | e19e06d91eff086b4649c5524b3756e9c8e79fbe (patch) | |
| tree | 3024a6e68eba1dc399941d3817570535dd688f9d /lib/public_key/doc/src/public_key.xml | |
| parent | 4da32ec432dd2dee0b19403bed21a836f1638549 (diff) | |
| parent | 1d019afd9d69eaa566d652117b607c83bfb93b31 (diff) | |
| download | otp-e19e06d91eff086b4649c5524b3756e9c8e79fbe.tar.gz otp-e19e06d91eff086b4649c5524b3756e9c8e79fbe.tar.bz2 otp-e19e06d91eff086b4649c5524b3756e9c8e79fbe.zip | |
Merge branch 'ingela/ssl/ECC-combos/OTP-14334'
* ingela/ssl/ECC-combos/OTP-14334:
ssl: Generate correct certificate chains for the ECC tests
public_key: Public RSA key is present in private key
Diffstat (limited to 'lib/public_key/doc/src/public_key.xml')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 2300ce3937..940585575c 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -331,14 +331,15 @@ </func> <func> - <name>generate_key(Params) -> {Public::binary(), Private::binary()} | #'ECPrivateKey'{} | {#'RSAPublicKey'{}, #'RSAPrivateKey'{}}</name> + <name>generate_key(Params) -> {Public::binary(), Private::binary()} | #'ECPrivateKey'{} | #'RSAPrivateKey'{}</name> <fsummary>Generates a new keypair.</fsummary> <type> <v>Params = #'DHParameter'{} | {namedCurve, oid()} | #'ECParameters'{} | {rsa, Size::integer(), PubExp::integer} </v> </type> <desc> - <p>Generates a new keypair. See also + <p>Generates a new keypair. Note that except for Diffie-Hellman + the public key is included in the private key structure. See also <seealso marker="crypto:crypto#generate_key/2">crypto:generate_key/2</seealso> </p> </desc> |