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

PR: 381

diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c
index 488aea424470dbae93527f0ca277ba9cc84abdbb..b3757e2e8dfc2d1eb57aef85f91943ff9ff95988 100644 (file)
--- a/crypto/engine/hw_ncipher.c
+++ b/crypto/engine/hw_ncipher.c
@@ -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);
        }

diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index 06d1c2ba9370bcec3a2c16db7bf968f922bbbe81..1dad878ff6d8d6fb076082ee86da6c68ee795891 100644 (file)
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -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);
                }