Use algo_properties_st in ncr_pk_ctx.oaep_hash

2 files changed, 10 insertions, 6 deletions

diff --git a/ncr-pk.c b/ncr-pk.c
index 78a9030..50ab0ab 100644
--- a/ncr-pk.c
+++ b/ncr-pk.c
@@ -355,12 +355,16 @@ int ret;
 		case NCR_ALG_RSA:
 			if (params->params.rsa.type == RSA_PKCS1_V1_5)
 				ctx->type = LTC_LTC_PKCS_1_V1_5;
-			else if (params->params.rsa.type == RSA_PKCS1_OAEP)
+			else if (params->params.rsa.type == RSA_PKCS1_OAEP) {
 				ctx->type = LTC_LTC_PKCS_1_OAEP;
-			else if (params->params.rsa.type == RSA_PKCS1_PSS)
+				ctx->oaep_hash = _ncr_algo_to_properties(params->params.rsa.oaep_hash);
+				if (ctx->oaep_hash == NULL) {
+				  err();
+				  return -EINVAL;
+				}
+			} else if (params->params.rsa.type == RSA_PKCS1_PSS)
 				ctx->type = LTC_LTC_PKCS_1_PSS;
 			
-			ctx->oaep_hash = params->params.rsa.oaep_hash;
 			ctx->salt_len = params->params.rsa.pss_salt;
 			break;
 		case NCR_ALG_DSA:
@@ -385,7 +389,7 @@ unsigned long osize = *output_size;
 	switch(ctx->algorithm->algo) {
 		case NCR_ALG_RSA:
 			cret = rsa_encrypt_key_ex( input, input_size, output, &osize, 
-				NULL, 0, ctx->oaep_hash, ctx->type, &ctx->key->key.pk.rsa);
+				NULL, 0, ctx->oaep_hash->algo, ctx->type, &ctx->key->key.pk.rsa);
 
 			if (cret != CRYPT_OK) {
 				printk("cret: %d type: %d\n", cret, ctx->type);
@@ -415,7 +419,7 @@ int stat;
 	switch(ctx->algorithm->algo) {
 		case NCR_ALG_RSA:
 			cret = rsa_decrypt_key_ex( input, input_size, output, &osize, 
-				NULL, 0, ctx->oaep_hash, ctx->type, &stat, &ctx->key->key.pk.rsa);
+				NULL, 0, ctx->oaep_hash->algo, ctx->type, &stat, &ctx->key->key.pk.rsa);
 
 			if (cret != CRYPT_OK) {
 				err();
diff --git a/ncr-pk.h b/ncr-pk.h
index 72a2786..f873255 100644
--- a/ncr-pk.h
+++ b/ncr-pk.h
@@ -8,7 +8,7 @@ struct ncr_pk_ctx {
 	
 	const struct algo_properties_st *sign_hash; /* for verification */
 	
-	ncr_algorithm_t oaep_hash;
+	const struct algo_properties_st *oaep_hash;
 	int salt_len; /* for RSA-PSS signatures */
 	
 	int type; /* libtomcrypt type */