File 2536-public_key-Update-specs-and-doc.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2536-public_key-Update-specs-and-doc.patch of Package erlang

From 06ddc215ec93ff712d933240bbebcf8b6974cf73 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 22 Apr 2021 14:49:26 +0200
Subject: [PATCH 6/8] public_key: Update specs and doc

---
 lib/public_key/doc/src/public_key.xml | 10 ++++++++--
 lib/public_key/src/public_key.erl     |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 1966338c4d..1580a685b6 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -112,10 +112,15 @@
 <datatype>
 <name name="ed_public_key"/>
 <desc>
-	<warning>This format of the EdDSA curves is temporary and may change without prior notice!</warning>
+	<warning>The tagged ed_pub format will not be returned from any public_key
+	functions but can be used as input, should be considered deprecated.</warning>
 </desc>
 </datatype>
 
+ <datatype>
+ <name name="ed_params"/>
+ </datatype>
+
 <datatype>
 <name name="private_key"/>
 <name name="rsa_private_key"/>
@@ -129,7 +134,8 @@
 <datatype>
 <name name="ed_private_key"/>
 <desc>
-	<warning>This format of the EdDSA curves is temporary and may change without prior notice!</warning>
+	<warning>The tagged ed_pri format will not be returned from any public_key
+	functions but can be used as input, should be considered deprecated.</warning>
 </desc>
 </datatype>
 
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index b97d4f1f42..747b8d2211 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -85,9 +85,10 @@
 -type ecpk_parameters_api() :: ecpk_parameters() | #'ECParameters'{} | {namedCurve, Name::crypto:ec_named_curve()}.
 -type ec_public_key() :: {#'ECPoint'{}, ecpk_parameters_api()}.
 -type ec_private_key() :: #'ECPrivateKey'{}.
--type ed_public_key() :: {ed_pub, ed25519|ed448, Key::binary()}.
--type ed_private_key() :: {ed_pri, ed25519|ed448, Pub::binary(), Priv::binary()}.
-
+-type ed_public_key() :: {#'ECPoint'{}, ed_params()} | {ed_pub, ed25519|ed448, Key::binary()}.
+-type ed_private_key() :: #'ECPrivateKey'{parameters :: ed_params()} |
+ {ed_pri, ed25519|ed448, Pub::binary(), Priv::binary()}.
+-type ed_params() :: {namedCurve, ?'id-Ed25519' | ?'id-Ed448'}.
 -type key_params() :: #'DHParameter'{} | {namedCurve, oid()} | #'ECParameters'{} | 
 {rsa, Size::integer(), PubExp::integer()}. 
 -type der_encoded() :: binary().
-- 
2.26.2

Places

File 2536-public_key-Update-specs-and-doc.patch of Package erlang

Places