diff --git a/cr_hsm_code.c b/cr_hsm_code.c
index e057f04..1f0967c 100644
--- a/cr_hsm_code.c
+++ b/cr_hsm_code.c
@@ -333,7 +333,7 @@ int hsm_generate_random( unsigned char *buf, int bytes )
 	NFastApp_Free_Command( hsmHandle, NULL, NULL, &cmd );
 	NFastApp_Free_Reply( hsmHandle, NULL, NULL, &reply );
 
-	rreturn CR_GENID_SUCCESS;
+	return CR_GENID_SUCCESS;
 }	// hsm_generate_rand
 
 int hsm_get_rtc( time_t *time )
@@ -484,7 +484,6 @@ int hsm_rsa_encrypt( unsigned char *dst_buf, unsigned char *org_buf, int size )
 	cmd.args.encrypt.plain.type = PlainTextType_Bytes;
 	cmd.args.encrypt.plain.data.bytes.data.len = size;
 	cmd.args.encrypt.plain.data.bytes.data.ptr = org_buf;
-	cmd.args.encrypt.given_iv = &enc_iv;
 	
 	// encrypt command issue
 	ret_code = NFastApp_Transact( hsmConnection, NULL, &cmd, &reply, NULL );
@@ -523,7 +522,7 @@ int hsm_rsa_decrypt( unsigned char *dst_buf, unsigned char *org_buf, int size )
 	cmd.cmd = Cmd_Decrypt;
 	cmd.args.decrypt.flags = 0;
 	cmd.args.decrypt.key = hsmRsaPrivkeyid;
-	cmd.args.decrypt.mech = Mech_RSApPKCS1;
+	cmd.args.decrypt.mech = Mech_Any;
 	cmd.args.decrypt.cipher.mech = Mech_RSApPKCS1;
 	cmd.args.decrypt.cipher.data.generic128.cipher.len = size;
 	cmd.args.decrypt.cipher.data.generic128.cipher.ptr = org_buf;