diff options
| author | Hans Nilsson <[email protected]> | 2015-11-06 10:25:24 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-11-06 10:25:24 +0100 |
| commit | 98ce5c34a27b3fd95febba5c44d87bfdbd40a822 (patch) | |
| tree | 464119590e616987173862960dfe5d7d85413b2e /lib/public_key/src/public_key.erl | |
| parent | 2204a4b614447551e4d70c47f885d8c9901f7cb0 (diff) | |
| parent | a3bc0687a34623824bf980c9ed19eb204dcccf66 (diff) | |
| download | otp-98ce5c34a27b3fd95febba5c44d87bfdbd40a822.tar.gz otp-98ce5c34a27b3fd95febba5c44d87bfdbd40a822.tar.bz2 otp-98ce5c34a27b3fd95febba5c44d87bfdbd40a822.zip | |
Merge branch 'maint'
* maint:
ssh: correct a bad doc xref
public_key: renamed priv/ssh_moduli -> priv/moduli
ssh, public_key: updates after doc review
ssh: changes after doc review
ssh: extend 'dh_gex_limits' to server side
ssh: option dh_gex_groups with tag ssh_moduli_file
ssh, public_key: random selection of diffie-hellman moduli
Diffstat (limited to 'lib/public_key/src/public_key.erl')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 8288f68f7f..a79badef24 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -35,6 +35,8 @@ decrypt_private/2, decrypt_private/3, encrypt_public/2, encrypt_public/3, decrypt_public/2, decrypt_public/3, + dh_gex_group/4, + dh_gex_group_sizes/0, sign/3, verify/4, generate_key/1, compute_key/2, compute_key/3, @@ -373,6 +375,13 @@ encrypt_private(PlainText, crypto:private_encrypt(rsa, PlainText, format_rsa_private_key(Key), Padding). %%-------------------------------------------------------------------- +dh_gex_group_sizes() -> + pubkey_ssh:dh_gex_group_sizes(). + +dh_gex_group(Min, N, Max, Groups) -> + pubkey_ssh:dh_gex_group(Min, N, Max, Groups). + +%%-------------------------------------------------------------------- -spec generate_key(#'DHParameter'{} | {namedCurve, Name ::oid()} | #'ECParameters'{}) -> {Public::binary(), Private::binary()} | #'ECPrivateKey'{}. |