Use of algo_properties to avoid linear search on a table for each property.

1 files changed, 7 insertions, 5 deletions

diff --git a/libtomcrypt/headers/tomcrypt_pkcs.h b/libtomcrypt/headers/tomcrypt_pkcs.h
index 8e43942..be0d7f6 100644
--- a/libtomcrypt/headers/tomcrypt_pkcs.h
+++ b/libtomcrypt/headers/tomcrypt_pkcs.h
@@ -3,6 +3,8 @@
 /* ===> LTC_PKCS #1 -- RSA Cryptography <=== */
 #ifdef LTC_PKCS_1
 
+struct algo_properties_st;
+
 enum ltc_pkcs_1_v1_5_blocks
 {
   LTC_LTC_PKCS_1_EMSA   = 1,        /* Block type 1 (LTC_PKCS #1 v1.5 signature padding) */
@@ -16,7 +18,7 @@ enum ltc_pkcs_1_paddings
   LTC_LTC_PKCS_1_PSS    = 3         /* LTC_PKCS #1 v2.1 signature padding */
 };
 
-int pkcs_1_mgf1(      int            hash_idx,
+int pkcs_1_mgf1(const struct algo_properties_st *hash,
                 const unsigned char *seed, unsigned long seedlen,
                       unsigned char *mask, unsigned long masklen);
 
@@ -42,23 +44,23 @@ int pkcs_1_v1_5_decode(const unsigned char *msg,
 /* *** v2.1 padding */
 int pkcs_1_oaep_encode(const unsigned char *msg,    unsigned long msglen,
                        const unsigned char *lparam, unsigned long lparamlen,
-                             unsigned long modulus_bitlen, int  hash_idx,
+                             unsigned long modulus_bitlen, const struct algo_properties_st *hash,
                              unsigned char *out,    unsigned long *outlen);
 
 int pkcs_1_oaep_decode(const unsigned char *msg,    unsigned long msglen,
                        const unsigned char *lparam, unsigned long lparamlen,
-                             unsigned long modulus_bitlen, int hash_idx,
+                             unsigned long modulus_bitlen, const struct algo_properties_st *hash,
                              unsigned char *out,    unsigned long *outlen,
                              int           *res);
 
 int pkcs_1_pss_encode(const unsigned char *msghash, unsigned long msghashlen,
-                            unsigned long saltlen, int           hash_idx,
+                            unsigned long saltlen, const struct algo_properties_st *hash,
                             unsigned long modulus_bitlen,
                             unsigned char *out,     unsigned long *outlen);
 
 int pkcs_1_pss_decode(const unsigned char *msghash, unsigned long msghashlen,
                       const unsigned char *sig,     unsigned long siglen,
-                            unsigned long saltlen,  int           hash_idx,
+                            unsigned long saltlen, const struct algo_properties_st *hash,
                             unsigned long modulus_bitlen, int    *res);
 
 #endif /* LTC_PKCS_1 */