Commit 72951df7 authored by Richard Levitte's avatar Richard Levitte
Browse files

Only check for a result buffer if the allocated string is a prompt string. 

PR: 381
parent a9b41af7

crypto/engine/hw_ncipher.c

+2 −2
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa) 


		/* Perform the operation */

		ret = p_hwcrhk_ModExpCRT(hwcrhk_context, m_a, m_p, m_q,

			m_dmp1, m_dmq1, m_iqmp, &m_r, NULL);

			m_dmp1, m_dmq1, m_iqmp, &m_r, &rmsg);



		/* Convert the response */

		r->top = m_r.size / sizeof(BN_ULONG);
@@ -1320,7 +1320,7 @@ static void hwcrhk_log_message(void *logstr, const char *message) 
		lstream=*(BIO **)logstr;

	if (lstream)

		{

		BIO_write(lstream, message, strlen(message));

		BIO_printf(lstream, "%s\n", message);

		}

	CRYPTO_w_unlock(CRYPTO_LOCK_BIO);

	}

crypto/ui/ui_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ static UI_STRING *general_allocate_prompt(UI *ui, const char *prompt, 
		{

		UIerr(UI_F_GENERAL_ALLOCATE_PROMPT,ERR_R_PASSED_NULL_PARAMETER);

		}

	else if (result_buf == NULL)

	else if ((type == UIT_PROMPT || type == UIT_VERIFY

			 || type == UIT_BOOLEAN) && result_buf == NULL)

		{

		UIerr(UI_F_GENERAL_ALLOCATE_PROMPT,UI_R_NO_RESULT_BUFFER);

		}