SecurityPolicy: Expose reusable methods across SecurityPolicy plugins

plugins/securityPolicies/ua_securitypolicies.h

@@ -10,6 +10,7 @@
 #define UA_SECURITYPOLICIES_H_
 
 #include "ua_plugin_securitypolicy.h"
+#include <mbedtls/md.h>
 
 _UA_BEGIN_DECLS
 
@@ -34,6 +35,12 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
                                  const UA_ByteString localPrivateKey,
                                  const UA_Logger *logger);
 
+/* Internal definitions for reuse between policies */
+UA_StatusCode
+generateKey_sha1p(mbedtls_md_context_t *sha1MdContext,
+                  const UA_ByteString *secret, const UA_ByteString *seed,
+                  UA_ByteString *out);
+
 #endif
 
 _UA_END_DECLS

plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c

@@ -477,16 +477,10 @@ swapBuffers(UA_ByteString *const bufA, UA_ByteString *const bufB) {
     *bufB = tmp;
 }
 
-static UA_StatusCode
-sym_generateKey_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
-                                 const UA_ByteString *secret, const UA_ByteString *seed,
-                                 UA_ByteString *out) {
-    if(securityPolicy == NULL || secret == NULL || seed == NULL || out == NULL)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    Basic128Rsa15_PolicyContext *pc =
-        (Basic128Rsa15_PolicyContext *)securityPolicy->policyContext;
-
+UA_StatusCode
+generateKey_sha1p(mbedtls_md_context_t *sha1MdContext,
+                  const UA_ByteString *secret, const UA_ByteString *seed,
+                  UA_ByteString *out) {
     size_t hashLen = 0;
     const mbedtls_md_info_t *mdInfo = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
     hashLen = (size_t)mbedtls_md_get_size(mdInfo);
@@ -509,7 +503,7 @@ sym_generateKey_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
         ANext_and_seed.data
     };
 
-    md_hmac(&pc->sha1MdContext, secret, seed, A.data);
+    md_hmac(sha1MdContext, secret, seed, A.data);
 
     UA_StatusCode retval = 0;
     for(size_t offset = 0; offset < out->length; offset += hashLen) {
@@ -531,8 +525,8 @@ sym_generateKey_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
             bufferAllocated = UA_TRUE;
         }
 
-        md_hmac(&pc->sha1MdContext, secret, &A_and_seed, outSegment.data);
-        md_hmac(&pc->sha1MdContext, secret, &A, ANext.data);
+        md_hmac(sha1MdContext, secret, &A_and_seed, outSegment.data);
+        md_hmac(sha1MdContext, secret, &A, ANext.data);
 
         if(retval != UA_STATUSCODE_GOOD) {
             if(bufferAllocated)
@@ -556,6 +550,19 @@ sym_generateKey_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+sym_generateKey_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
+                                 const UA_ByteString *secret, const UA_ByteString *seed,
+                                 UA_ByteString *out) {
+    if(securityPolicy == NULL || secret == NULL || seed == NULL || out == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Basic128Rsa15_PolicyContext *pc =
+        (Basic128Rsa15_PolicyContext *)securityPolicy->policyContext;
+
+    return generateKey_sha1p(&pc->sha1MdContext, secret, seed, out);
+}
+
 static UA_StatusCode
 sym_generateNonce_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
                                    UA_ByteString *out) {