Browse Source

Merge branch 'fperrad-20170225_lint' into develop

Karel Miko 8 years ago
parent
commit
b3534def42
2 changed files with 7 additions and 2 deletions
  1. 2 2
      src/hashes/chc/chc.c
  2. 5 0
      src/headers/tomcrypt_pk.h

+ 2 - 2
src/hashes/chc/chc.c

@@ -156,8 +156,8 @@ static int chc_compress(hash_state *md, unsigned char *buf)
 }
 }
 
 
 /* function for processing blocks */
 /* function for processing blocks */
-int _chc_process(hash_state * md, const unsigned char *buf, unsigned long len);
-HASH_PROCESS(_chc_process, chc_compress, chc, (unsigned long)cipher_blocksize)
+static int _chc_process(hash_state * md, const unsigned char *buf, unsigned long len);
+static HASH_PROCESS(_chc_process, chc_compress, chc, (unsigned long)cipher_blocksize)
 
 
 /**
 /**
    Process a block of memory though the hash
    Process a block of memory though the hash

+ 5 - 0
src/headers/tomcrypt_pk.h

@@ -404,6 +404,11 @@ typedef struct {
 } dsa_key;
 } dsa_key;
 
 
 int dsa_make_key(prng_state *prng, int wprng, int group_size, int modulus_size, dsa_key *key);
 int dsa_make_key(prng_state *prng, int wprng, int group_size, int modulus_size, dsa_key *key);
+
+int dsa_make_key_ex(prng_state *prng, int wprng, int group_size, int modulus_size, dsa_key *key, char* p_hex, char* q_hex, char* g_hex);
+
+int dsa_make_params(prng_state *prng, int wprng, int group_size, int modulus_size, void *p, void *q, void *g);
+
 void dsa_free(dsa_key *key);
 void dsa_free(dsa_key *key);
 
 
 int dsa_sign_hash_raw(const unsigned char *in,  unsigned long inlen,
 int dsa_sign_hash_raw(const unsigned char *in,  unsigned long inlen,