adopt to the latest changes in new-rsa-api branch

Author: karel-m

src/headers/tomcrypt_private.h

@@ -526,6 +526,7 @@ int rsa_import_pkcs1(const unsigned char *in, unsigned long inlen, rsa_key *key)
 int rsa_import_pkcs8_asn1(ltc_asn1_list *alg_id, ltc_asn1_list *priv_key, rsa_key *key);
 int rsa_import_spki(const unsigned char *in, unsigned long inlen, rsa_key *key);
 int rsa_decode_parameters(const ltc_asn1_list *parameters, rsa_key *key);
+int rsa_decode_pss_parameters(const ltc_asn1_list *parameters, ltc_rsa_parameters *rsa_params);
 #endif /* LTC_MRSA */
 
 /* ---- DH Routines ---- */

src/pk/asn1/x509/x509_import.c

@@ -273,7 +273,7 @@ static int s_x509_get_sig_alg(const ltc_asn1_list *seq, ltc_x509_signature_algor
       return err;
    }
    if (sig_alg->pka == LTC_PKA_RSA_PSS && seq->child && seq->child->next) {
-      if ((err = rsa_decode_parameters(seq->child->next, &sig_alg->u.rsa_params)) != CRYPT_OK) {
+      if ((err = rsa_decode_pss_parameters(seq->child->next, &sig_alg->u.rsa_params)) != CRYPT_OK) {
          return err;
       }
    }

src/pk/asn1/x509/x509_utils.c

@@ -25,7 +25,7 @@ static LTC_INLINE int s_pka_verify(const unsigned char *msg, unsigned long msgle
    switch (key->id) {
 #ifdef LTC_MRSA
       case LTC_PKA_RSA:
-         rsa_params.params.hash_alg = hash_descriptor[sig_args->hash_idx].name;
+         rsa_params.params.hash_idx = sig_args->hash_idx;
          rsa_params.padding = LTC_PKCS_1_V1_5;
          /* RSA Keys usually use PKCS#1 v1.5 padding */
          return rsa_verify_hash_v2(sig, siglen, msg, msglen, &rsa_params, stat, &key->u.rsa);
@@ -103,17 +103,17 @@ int x509_cert_is_signed_by(const ltc_x509_certificate *cert, const ltc_pka_key *
       msglen = cert->tbs_certificate.asn1->size;
    } else {
       if (key->id == LTC_PKA_RSA_PSS) {
-         if (cert->signature_algorithm.u.rsa_params.pss_oaep) {
+         if (cert->signature_algorithm.u.rsa_params.hash_idx >= 0) {
             sig_args.rsa_params = &cert->signature_algorithm.u.rsa_params;
-            if (key->u.rsa.params.pss_oaep && !rsa_params_equal(&key->u.rsa.params, sig_args.rsa_params)) {
+            if (key->u.rsa.pss_oaep && !rsa_params_equal(&key->u.rsa.params, sig_args.rsa_params)) {
                return CRYPT_PK_TYPE_MISMATCH;
             }
-         } else if (key->u.rsa.params.pss_oaep) {
+         } else if (key->u.rsa.pss_oaep) {
             sig_args.rsa_params = &key->u.rsa.params;
          } else {
             return CRYPT_PK_TYPE_MISMATCH;
          }
-         hashalg = sig_args.rsa_params->hash_alg;
+         hashalg = hash_descriptor[sig_args.rsa_params->hash_idx].name;
       } else {
          hashalg = cert->signature_algorithm.u.hash;
       }

src/pk/rsa/rsa_import_x509.c

@@ -127,7 +127,7 @@ static int s_rsa_decode_parameters(const rsa_pss_parameters_data *d, ltc_rsa_par
    return CRYPT_OK;
 }
 
-int rsa_decode_parameters(const ltc_asn1_list *parameters, rsa_key *key)
+int rsa_decode_pss_parameters(const ltc_asn1_list *parameters, ltc_rsa_parameters *rsa_params)
 {
    int           err;
    rsa_pss_parameters_data d;
@@ -138,7 +138,13 @@ int rsa_decode_parameters(const ltc_asn1_list *parameters, rsa_key *key)
       return err;
    }
 
-   if ((err = s_rsa_decode_parameters(&d, &key->params)) != CRYPT_OK) {
+   return s_rsa_decode_parameters(&d, rsa_params);
+}
+
+int rsa_decode_parameters(const ltc_asn1_list *parameters, rsa_key *key)
+{
+   int err;
+   if ((err = rsa_decode_pss_parameters(parameters, &key->params)) != CRYPT_OK) {
       return err;
    }
    key->pss_oaep = 1;