aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-12-02 10:24:56 +0100
committerIngela Anderton Andin <[email protected]>2013-12-02 10:24:56 +0100
commitc3d9d667e028284d6f96f8e260d094f1775182ea (patch)
treef88229efc098d69e798132acc540835e11e24571 /lib/public_key
parentf2fc6a63429f0c7945e7644e5fe3d8ee265bd28f (diff)
parent239ce1c4781fe4fc25c55795573654453887f507 (diff)
downloadotp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.gz
otp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.bz2
otp-c3d9d667e028284d6f96f8e260d094f1775182ea.zip
Merge branch 'maint'
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/src/public_key.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index a4b6b8ad15..ceecbcc7f2 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -333,7 +333,7 @@ encrypt_private(PlainText,
crypto:private_encrypt(rsa, PlainText, format_rsa_private_key(Key), Padding).
%%--------------------------------------------------------------------
--spec generate_key(#'DHParameter'{} | {namedCurve, Name ::atom()} |
+-spec generate_key(#'DHParameter'{} | {namedCurve, Name ::oid()} |
#'ECParameters'{}) -> {Public::binary(), Private::binary()} |
#'ECPrivateKey'{}.
%% Description: Generates a new keypair