aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2013-05-03 12:28:39 +0200
committerIngela Anderton Andin <ingela@erlang.org>2013-05-08 10:39:22 +0200
commit01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c (patch)
tree3af15623a00b5d1bab96f039120ce2b67de2b5e1 /lib/public_key/src
parentcb1305212e71855890bbfb0a509a007543529d24 (diff)
downloadotp-01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c.tar.gz
otp-01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c.tar.bz2
otp-01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c.zip
ssl & public_key: Use standard name
Diffstat (limited to 'lib/public_key/src')
-rw-r--r--lib/public_key/src/public_key.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index f9042d5349..648dba3d5a 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -328,7 +328,7 @@ encrypt_private(PlainText,
%%--------------------------------------------------------------------
-spec generate_key(#'DHParameter'{} | {namedCurve, Name ::atom()} |
- #'OTPECParameters'{}) -> {Public::binary(), Private::binary()} |
+ #'ECParameters'{}) -> {Public::binary(), Private::binary()} |
#'ECPrivateKey'{}.
%% Description: Generates a new keypair
%%--------------------------------------------------------------------
@@ -336,7 +336,7 @@ generate_key(#'DHParameter'{prime = P, base = G}) ->
crypto:generate_key(dh, [P, G]);
generate_key({namedCurve, _} = Params) ->
ec_generate_key(Params);
-generate_key(#'OTPECParameters'{} = Params) ->
+generate_key(#'ECParameters'{} = Params) ->
ec_generate_key(Params).
%%--------------------------------------------------------------------
@@ -870,9 +870,9 @@ ec_generate_key(Params) ->
Term = crypto:generate_key(ecdh, Curve),
ec_key(Term, Params).
-ec_curve_spec( #'OTPECParameters'{fieldID = FieldId, curve = PCurve, base = Base, order = Order, cofactor = CoFactor }) ->
- Field = {pubkey_cert_records:supportedCurvesTypes(FieldId#'OTPFieldID'.fieldType),
- FieldId#'OTPFieldID'.parameters},
+ec_curve_spec( #'ECParameters'{fieldID = FieldId, curve = PCurve, base = Base, order = Order, cofactor = CoFactor }) ->
+ Field = {pubkey_cert_records:supportedCurvesTypes(FieldId#'FieldID'.fieldType),
+ FieldId#'FieldID'.parameters},
Curve = {erlang:list_to_binary(PCurve#'Curve'.a), erlang:list_to_binary(PCurve#'Curve'.b), none},
{Field, Curve, erlang:list_to_binary(Base), Order, CoFactor};
ec_curve_spec({namedCurve, OID}) ->