File 1542-snmp-Update-function-for-derivation-of-key... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1542-snmp-Update-function-for-derivation-of-keys-from-pas.patch of Package erlang (Revision 3a70bf3d6fd4a5cb52eaedadd0de8996)

Currently displaying revision 3a70bf3d6fd4a5cb52eaedadd0de8996 , Show latest

From 6cb4f333aee07de699eea2d4cc128b6b5edb3124 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 17 Sep 2021 19:05:53 +0200
Subject: [PATCH 2/9] [snmp] Update function for derivation of keys from
 passwords

OTP-17615
---
 lib/snmp/doc/src/snmp.xml      | 14 +++++-----
 lib/snmp/src/misc/snmp_usm.erl | 51 ++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/lib/snmp/doc/src/snmp.xml b/lib/snmp/doc/src/snmp.xml
index 9219e58ab1..4c3d2efa94 100644
--- a/lib/snmp/doc/src/snmp.xml
+++ b/lib/snmp/doc/src/snmp.xml
@@ -282,16 +282,16 @@
       <name since="">passwd2localized_key(Alg, Passwd, EngineID) -> Key</name>
       <fsummary>Generates an localized key</fsummary>
       <type>
-        <v>Alg = algorithm()</v>
-        <v>algorithm() = md5 | sha</v>
-        <v>Passwd = string()</v>
-        <v>EngineID = string()</v>
-        <v>Key = list()</v>
+        <v>Alg         = algorithm()</v>
+        <v>algorithm() = md5 | sha | sha224 | sha256 | sha384 | sha512</v>
+        <v>Passwd      = string()</v>
+        <v>EngineID    = string()</v>
+        <v>Key         = list()</v>
       </type>
       <desc>
         <p>Generates a key that can be used as an authentication
-          or privacy key using MD5 och SHA.  The key is
-          localized for EngineID.</p>
+	or privacy key using MD5, SHA, SHA224, SHA256, SHA354 or SHA512.
+	The key is localized for EngineID.</p>
 
         <marker id="octet_string_to_bits"></marker>
       </desc>
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index e46993aad4..840f44920a 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -65,6 +65,14 @@
 %%          The algorithm is described in appendix A.1 2) of
 %%          rfc2274.
 %%-----------------------------------------------------------------
+
+-type algorithm() :: md5 | sha | sha224 | sha256 | sha384 | sha512.
+
+-spec passwd2localized_key(Alg      :: algorithm(),
+                           Passwd   :: string(),
+                           EngineID :: string()) ->
+          LocalizedKey :: list().
+
 passwd2localized_key(Alg, Passwd, EngineID) when length(Passwd) > 0 ->
     Key = mk_digest(Alg, Passwd),
     localize_key(Alg, Key, EngineID).
@@ -73,43 +81,38 @@ passwd2localized_key(Alg, Passwd, EngineID) when length(Passwd) > 0 ->
 %%-----------------------------------------------------------------
 %% Func: localize_key/3
 %% Types: Alg      = md5 | sha
-%%        Passwd   = string()
+%%        Key      = binary()
 %%        EngineID = string()
 %% Purpose: Localizes an unlocalized key for EngineID.  See rfc2274
 %%          section 2.6 for a definition of localized keys.
 %%-----------------------------------------------------------------
+
+-spec localize_key(Alg      :: algorithm(),
+                   Key      :: binary(),
+                   EngineID :: string()) ->
+          LocalizedKey :: list().
+
 localize_key(Alg, Key, EngineID) ->
     Str = [Key, EngineID, Key],
     binary_to_list(crypto:hash(Alg, Str)).
 
 
-mk_digest(md5, Passwd) ->
-    mk_md5_digest(Passwd);
-mk_digest(sha, Passwd) ->
-    mk_sha_digest(Passwd).
-
-mk_md5_digest(Passwd) ->
-    Ctx = crypto:hash_init(md5),
-    Ctx2 = md5_loop(0, [], Ctx, Passwd, length(Passwd)),
-    crypto:hash_final(Ctx2).
-
-md5_loop(Count, Buf, Ctx, Passwd, PasswdLen) when Count < 1048576 ->
-    {Buf64, NBuf} = mk_buf64(length(Buf), Buf, Passwd, PasswdLen),
-    NCtx = crypto:hash_update(Ctx, Buf64),
-    md5_loop(Count+64, NBuf, NCtx, Passwd, PasswdLen);
-md5_loop(_Count, _Buf, Ctx, _Passwd, _PasswdLen) ->
-    Ctx.
-
-mk_sha_digest(Passwd) ->
-    Ctx = crypto:hash_init(sha),
-    Ctx2 = sha_loop(0, [], Ctx, Passwd, length(Passwd)),
+mk_digest(Alg, Passwd)
+  when (Alg =:= md5)    orelse
+       (Alg =:= sha)    orelse
+       (Alg =:= sha224) orelse
+       (Alg =:= sha256) orelse 
+       (Alg =:= sha384) orelse 
+       (Alg =:= sha512) ->
+    Ctx  = crypto:hash_init(Alg),
+    Ctx2 = mk_digest_loop(0, [], Ctx, Passwd, length(Passwd)),
     crypto:hash_final(Ctx2).
 
-sha_loop(Count, Buf, Ctx, Passwd, PasswdLen) when Count < 1048576 ->
+mk_digest_loop(Count, Buf, Ctx, Passwd, PasswdLen) when Count < 1048576 ->
     {Buf64, NBuf} = mk_buf64(length(Buf), Buf, Passwd, PasswdLen),
     NCtx = crypto:hash_update(Ctx, Buf64),
-    sha_loop(Count+64, NBuf, NCtx, Passwd, PasswdLen);
-sha_loop(_Count, _Buf, Ctx, _Passwd, _PasswdLen) ->
+    mk_digest_loop(Count+64, NBuf, NCtx, Passwd, PasswdLen);
+mk_digest_loop(_Count, _Buf, Ctx, _Passwd, _PasswdLen) ->
     Ctx.
 
 %% Create a 64 bytes long string, by repeating Passwd as many times 
-- 
2.31.1

Places

File 1542-snmp-Update-function-for-derivation-of-keys-from-pas.patch of Package erlang (Revision 3a70bf3d6fd4a5cb52eaedadd0de8996)

Places