FW-867. Move SHA and HKDF functions to crypto driver

cwdao · May 18, 2020 · f727f78 · f727f78
1 parent 2dfaa2c
commit f727f78
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/drivers/SConscript b/drivers/SConscript
@@ -12,15 +12,21 @@ sources_c = [
     os.path.join('common','openserial.c'),
     os.path.join('common','opentimers.c'),
     os.path.join('common','crypto','ccms.c'),
-    os.path.join('common','crypto','aes128.c')
+    os.path.join('common','crypto','hkdf.c'),
+    os.path.join('common','crypto','hmac.c'),
+    os.path.join('common','crypto','sha224-256.c'),
+    os.path.join('common','crypto','aes128.c'),
+    os.path.join('common','crypto','usha.c')
 ]
 sources_h = [
     os.path.join('common','openhdlc.h'),
     os.path.join('common','opensensors.h'),
     os.path.join('common','openserial.h'),
     os.path.join('common','opentimers.h'),
     os.path.join('common','crypto','ccms.h'),
-    os.path.join('common','crypto','aes128.h')
+    os.path.join('common','crypto','aes128.h'),
+    os.path.join('common','crypto','sha.h'),
+    os.path.join('common','crypto','sha-private.h')
 ]
 
 if localEnv['board']=='python':

diff --git a/openweb/opencoap/hkdf.c → drivers/common/crypto/hkdf.c b/openweb/opencoap/hkdf.c → drivers/common/crypto/hkdf.c
diff --git a/openweb/opencoap/hmac.c → drivers/common/crypto/hmac.c b/openweb/opencoap/hmac.c → drivers/common/crypto/hmac.c
diff --git a/openweb/opencoap/sha-private.h → drivers/common/crypto/sha-private.h b/openweb/opencoap/sha-private.h → drivers/common/crypto/sha-private.h
diff --git a/openweb/opencoap/sha.h → drivers/common/crypto/sha.h b/openweb/opencoap/sha.h → drivers/common/crypto/sha.h
diff --git a/openweb/opencoap/sha224-256.c → drivers/common/crypto/sha224-256.c b/openweb/opencoap/sha224-256.c → drivers/common/crypto/sha224-256.c
diff --git a/openweb/opencoap/usha.c → drivers/common/crypto/usha.c b/openweb/opencoap/usha.c → drivers/common/crypto/usha.c
diff --git a/openweb/SConscript b/openweb/SConscript
@@ -9,12 +9,8 @@ sources_c = [
     "openweb.c",
     # ==== opencoap
     os.path.join("opencoap", "cborencoder.c"),
-    os.path.join("opencoap", "hkdf.c"),
-    os.path.join("opencoap", "hmac.c"),
     os.path.join("opencoap", "coap.c"),
     os.path.join("opencoap", "openoscoap.c"),
-    os.path.join("opencoap", "sha224-256.c"),
-    os.path.join("opencoap", "usha.c"),
     # ==== cjoin
     os.path.join("cjoin", "cjoin.c"),
     os.path.join("cjoin", "cojp_cbor.c")
@@ -26,8 +22,6 @@ sources_h = [
     os.path.join("opencoap", "cborencoder.h"),
     os.path.join("opencoap", "coap.h"),
     os.path.join("opencoap", "openoscoap.h"),
-    os.path.join("opencoap", "sha.h"),
-    os.path.join("opencoap", "sha-private.h"),
     # ==== cjoin
     os.path.join("cjoin", "cjoin.h"),
     os.path.join("cjoin", "cojp_cbor.h")

diff --git a/projects/python/SConscript.env b/projects/python/SConscript.env
@@ -370,6 +370,9 @@ functionsToChange = [
     'aes_ctr_enc',
     'aes_cbc_enc_raw',
     'aes_ctr_enc_raw',
+    # hash
+    'sha',
+    'sha-private',
     # openserial
     'openserial_init',
     'openserial_register',