[#375] ut_ep_key_mgmt tests passing

Author: dccutrig

Diff for: .gitignore

@@ -32,4 +32,7 @@ test/CMakeFiles/*
 Testing/Temporary/*
 docs/wiki/_build
 docs/wiki/_templates
+support/scripts/src/CmakeFiles/*
+support/scripts/test/CMakeFiles/*
+support/scripts/bin/*
 

Diff for: include/crypto_error.h

@@ -135,22 +135,24 @@
 #define CRYPTO_LIB_ERR_SDLS_EP_WRONG_SPI                                    (-62)
 #define CRYPTO_LIB_ERR_SDLS_EP_NOT_BUILT                                    (-63)
 #define CRYPTO_LIB_ERR_BAD_TLV_LENGTH                                       (-64)
-#define CRYPTO_LIB_ERR_SHIVF_LEN_GREATER_THAN_MAX_IV_SIZE                   (-65)
-#define CRYPTO_LIB_ERR_SHSNF_LEN_GREATER_THAN_MAX_ARSN_SIZE                 (-66)
-#define CRYPTO_LIB_ERR_ABM_LEN_GREATER_THAN_MAX_ABM_SIZE                    (-67)
-#define CRYPTO_LIB_ERR_STMACF_LEN_GREATER_THAN_MAX_MAC_SIZE                 (-68)
-#define CRYPTO_LIB_ERR_SHPLF_LEN_GREATER_THAN_MAX_PAD_SIZE                  (-69)
-#define CRYPTO_LIB_ERR_INVALID_SVC_TYPE_WITH_ARSN                           (-70)
-#define CRYPTO_LIB_ERR_ARSN_LT_SHSNF                                        (-71)
-#define CRYPTO_LIB_ERR_TC_FRAME_LENGTH_UNDERFLOW                            (-72)
-#define CRYPTO_LIB_ERR_IV_EXCEEDS_INCREMENT_SIZE                            (-73)
-#define CRYPTO_LIB_ERR_AOS_FRAME_LENGTH_UNDERFLOW                           (-74)
-#define CRYPTO_LIB_ERR_TM_FRAME_LENGTH_UNDERFLOW                            (-75)
-#define CRYPTO_LIB_ERR_AOS_FL_LT_MAX_FRAME_SIZE                             (-76)
-#define CRYPTO_LIB_ERR_TM_FL_LT_MAX_FRAME_SIZE                              (-77)
-#define CRYPTO_LIB_ERR_INVALID_FHECF                                        (-78)
-
-#define CRYPTO_CORE_ERROR_CODES_MAX -78
+#define CRYPTO_LIB_ERR_OTAR_BAD_TLV_LENGTH                                  (-65)
+#define CRYPTO_LIB_ERR_SHIVF_LEN_GREATER_THAN_MAX_IV_SIZE                   (-66)
+#define CRYPTO_LIB_ERR_SHSNF_LEN_GREATER_THAN_MAX_ARSN_SIZE                 (-67)
+#define CRYPTO_LIB_ERR_ABM_LEN_GREATER_THAN_MAX_ABM_SIZE                    (-68)
+#define CRYPTO_LIB_ERR_STMACF_LEN_GREATER_THAN_MAX_MAC_SIZE                 (-69)
+#define CRYPTO_LIB_ERR_SHPLF_LEN_GREATER_THAN_MAX_PAD_SIZE                  (-70)
+#define CRYPTO_LIB_ERR_INVALID_SVC_TYPE_WITH_ARSN                           (-71)
+#define CRYPTO_LIB_ERR_ARSN_LT_SHSNF                                        (-72)
+#define CRYPTO_LIB_ERR_TC_FRAME_LENGTH_UNDERFLOW                            (-73)
+#define CRYPTO_LIB_ERR_IV_EXCEEDS_INCREMENT_SIZE                            (-74)
+#define CRYPTO_LIB_ERR_AOS_FRAME_LENGTH_UNDERFLOW                           (-75)
+#define CRYPTO_LIB_ERR_TM_FRAME_LENGTH_UNDERFLOW                            (-76)
+#define CRYPTO_LIB_ERR_AOS_FL_LT_MAX_FRAME_SIZE                             (-77)
+#define CRYPTO_LIB_ERR_TM_FL_LT_MAX_FRAME_SIZE                              (-78)
+#define CRYPTO_LIB_ERR_INVALID_FHECF                                        (-79)
+
+
+#define CRYPTO_CORE_ERROR_CODES_MAX -79
 
 // Define codes for returning MDB Strings, and determining error based on strings
 #define CAM_ERROR_CODES     600

Diff for: src/core/crypto_error.c

@@ -86,6 +86,7 @@ char *crypto_enum_errlist_core[] = {(char *)"CRYPTO_LIB_SUCCESS",
                                     (char *)"CRYPTO_LIB_ERR_SDLS_EP_WRONG_SPI",
                                     (char *)"CRYPTO_LIB_ERR_SDLS_EP_NOT_BUILT",
                                     (char *)"CRYPTO_LIB_ERR_BAD_TLV_LENGTH",
+                                    (char *)"CRYPTO_LIB_ERR_OTAR_BAD_TLV_LENGTH",
                                     (char *)"CRYPTO_LIB_ERR_SHIVF_LEN_GREATER_THAN_MAX_IV_SIZE",
                                     (char *)"CRYPTO_LIB_ERR_SHSNF_LEN_GREATER_THAN_MAX_ARSN_SIZE",
                                     (char *)"CRYPTO_LIB_ERR_ABM_LEN_GREATER_THAN_MAX_ABM_SIZE",

Diff for: src/core/crypto_key_mgmt.c

@@ -45,8 +45,7 @@ int32_t Crypto_Key_OTAR(void)
     int         y;
     int32_t     status = CRYPTO_LIB_SUCCESS;
     // uint16_t pdu_len = (uint16_t) sdls_frame.tlv_pdu.hdr.pdu_len[1] << 8 | sdls_frame.tlv_pdu.hdr.pdu_len[0];
-    int pdu_keys =
-        (sdls_frame.tlv_pdu.hdr.pdu_len - SDLS_KEYID_LEN - SDLS_IV_LEN - MAC_SIZE) / (SDLS_KEYID_LEN + SDLS_KEY_LEN);
+    int pdu_keys = ((sdls_frame.tlv_pdu.hdr.pdu_len/BYTE_LEN) - SDLS_KEYID_LEN - SDLS_IV_LEN - MAC_SIZE) / (SDLS_KEYID_LEN + SDLS_KEY_LEN);
     int           w;
     crypto_key_t *ekp = NULL;
     int expected_pdu_len = SDLS_KEYID_LEN + SDLS_IV_LEN + ((SDLS_KEYID_LEN + SDLS_KEY_LEN) * pdu_keys) + MAC_SIZE;
@@ -55,7 +54,7 @@ int32_t Crypto_Key_OTAR(void)
 #endif
     if ((sdls_frame.tlv_pdu.hdr.pdu_len / BYTE_LEN) < SDLS_KEYID_LEN + SDLS_IV_LEN + ((SDLS_KEYID_LEN + SDLS_KEY_LEN) * pdu_keys) + MAC_SIZE)
     {
-        return CRYPTO_LIB_ERR_BAD_TLV_LENGTH;
+        return CRYPTO_LIB_ERR_OTAR_BAD_TLV_LENGTH;
     }
 
     // Master Key ID