Merge branch 'milestone/monitoring' into jennifer/no_mq_priorities

[trust_router.git] / common / tr_dh.c

diff --git a/common/tr_dh.c b/common/tr_dh.c
index 257b77c..906d53c 100644 (file)
--- a/common/tr_dh.c
+++ b/common/tr_dh.c
@@ -82,7 +82,7 @@ DH *tr_dh_new(void)
   return DH_new();
 }
 
-DH *tr_create_dh_params(unsigned char *priv_key, 
+DH *tr_create_dh_params(unsigned char *priv_key,
                        size_t keylen) {
 
   DH *dh = NULL;
@@ -95,6 +95,7 @@ DH *tr_create_dh_params(unsigned char *priv_key,
       (NULL == (dh->p = BN_new())) ||
       (NULL == (dh->q = BN_new()))) {
     DH_free(dh);
+    return NULL;
   }
 
   BN_set_word(dh->g, 2);
@@ -235,15 +236,15 @@ DH *tr_dh_dup(DH *in)
   return out;
 }
 
-int tr_compute_dh_key(unsigned char **pbuf, 
-                     BIGNUM *pub_key, 
+int tr_compute_dh_key(unsigned char **pbuf,
+                     BIGNUM *pub_key,
                      DH *priv_dh) {
   size_t buflen;
   unsigned char *buf = NULL;;
   int rc = 0;
-  
-  if ((!pbuf) || 
-      (!pub_key) || 
+
+  if ((!pbuf) ||
+      (!pub_key) ||
       (!priv_dh)) {
     tr_debug("tr_compute_dh_key: Invalid parameters.");
     return(-1);
@@ -256,7 +257,7 @@ int tr_compute_dh_key(unsigned char **pbuf,
     return -1;
   }
 
-  
+
   rc = DH_compute_key(buf, pub_key, priv_dh);
   if (0 <= rc) {
     *pbuf = buf;
@@ -277,14 +278,21 @@ int tr_dh_pub_hash(TID_REQ *request,
   unsigned char *bn_bytes = talloc_zero_size(request, BN_num_bytes(pub));
   unsigned char *digest = talloc_zero_size(request, SHA_DIGEST_LENGTH+1);
   assert(bn_bytes && digest);
-                                   BN_bn2bin(pub, bn_bytes);
-                                   SHA1(bn_bytes, BN_num_bytes(pub), digest);
-                                   *out_digest = digest;
-                                   *out_len = SHA_DIGEST_LENGTH;
-                                   return 0;
+  BN_bn2bin(pub, bn_bytes);
+  SHA1(bn_bytes, BN_num_bytes(pub), digest);
+  *out_digest = digest;
+  *out_len = SHA_DIGEST_LENGTH;
+
+  talloc_free(bn_bytes);
+  return 0;
+}
+
+void tr_dh_free(unsigned char *dh_buf)
+{
+  free(dh_buf);
 }
 
-void tr_dh_free(DH *dh)
+void tr_dh_destroy(DH *dh)
 {
   DH_free(dh);
 }