Add Option to do Lenstra verify using QAT HW instead of OpenSSL SW.

Lenstra verifcation using QAT Hardware when enabled via configure flag "enable-qat_hw_lenstra_verify_hw". Default is to do lenstra verify using OpenSSL SW. Signed-off-by: Yogaraj Alamenda <yogarajx.alamenda@intel.com>

Author: venkatesh921

Makefile.am

@@ -81,6 +81,7 @@ AM_CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_qat_debug_file) \
  $(enable_qat_hw_hkdf) $(enable_qat_hw_ecx) \
  $(enable_qat_hw_small_pkt_offload) \
  $(enable_qat_hw_lenstra_protection) \
+ $(enable_qat_hw_lenstra_verify_hw) \
  $(enable_qat_sw_gcm) $(enable_qat_sw_rsa) \
  $(enable_qat_sw_ecx) $(enable_qat_sw_ecdsa) \
  $(enable_qat_sw_ecdh) $(enable_qat_sw_heuristic_timeout) \

README.md

@@ -1122,6 +1122,10 @@ Optional
  https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00071&languageid=en-fr
  https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5681
 
+--enable-qat_hw_lenstra_verify_hw
+ Enable Lenstra Verify using QAT HW instead of OpenSSL Software method.
+ (disabled by default).
+
 --disable-qat_auto_engine_init_on_fork/--enable-qat_auto_engine_init_on_fork
  Disable/Enable the engine from being initialized automatically following a
  fork operation. This is useful in a situation where you want to tightly

configure.ac

@@ -207,6 +207,11 @@ AC_ARG_ENABLE(qat_hw_lenstra_protection,
  [Disable protection against Lenstra attack]))
 AC_SUBST(enable_qat_hw_lenstra_protection)
 
+AC_ARG_ENABLE(qat_hw_lenstra_verify_hw,
+ AS_HELP_STRING([--enable-qat_hw_lenstra_verify_hw],
+ [Enable Lenstra Verify using QAT HW instead of OpenSSL SW]))
+AC_SUBST(enable_qat_hw_lenstra_verify_hw)
+
 AC_ARG_ENABLE(qat_auto_engine_init_on_fork,
  AS_HELP_STRING([--disable-qat_auto_engine_init_on_fork],
  [Disable auto initialization of the engine following a fork]))
@@ -527,6 +532,15 @@ else
  AC_MSG_NOTICE([Lenstra attack protection enabled (default).])
 fi
 
+if test "x$enable_qat_hw_lenstra_verify_hw" = "xyes" -a "x$cflags_qat_hw" != "x"
+then
+ if test "x$enable_qat_hw_lenstra_protection" != "xno"
+ then
+ enable_qat_hw_lenstra_verify_hw="-DENABLE_QAT_HW_LENSTRA_VERIFY_HW"
+ AC_MSG_NOTICE([Lenstra check via QAT HW enabled.])
+ fi
+fi
+
 if test "x$enable_qat_debug" = "xyes"
 then
  enable_qat_debug="-DQAT_DEBUG"

qat_hw_rsa.c

@@ -912,6 +912,7 @@ int qat_rsa_priv_enc(int flen, const unsigned char *from, unsigned char *to,
  const BIGNUM *n = NULL;
  const BIGNUM *e = NULL;
  const BIGNUM *d = NULL;
+ int lenstra_ret = 0;
 #endif
 
  DEBUG("- Started.\n");
@@ -978,19 +979,27 @@ int qat_rsa_priv_enc(int flen, const unsigned char *from, unsigned char *to,
 
  /* Note: not checking 'd' as it is not used */
  if (e != NULL) { /* then a public key exists and we can effect Lenstra attack protection*/
- ver_msg = OPENSSL_zalloc(flen);
- if (ver_msg == NULL) {
- WARN("ver_msg zalloc failed.\n");
- QATerr(QAT_F_QAT_RSA_PRIV_ENC, ERR_R_MALLOC_FAILURE);
- sts = 0;
- goto exit_lenstra;
- }
- if ((RSA_meth_get_pub_dec(RSA_PKCS1_OpenSSL())
- (rsa_len, (const unsigned char *)to, ver_msg, rsa, padding) <= 0)
- || (CRYPTO_memcmp(from, ver_msg, flen) != 0)) {
- WARN("- Verify failed - redoing sign operation in s/w\n");
+ ver_msg = OPENSSL_zalloc(flen);
+ if (ver_msg == NULL) {
+ WARN("ver_msg zalloc failed.\n");
+ QATerr(QAT_F_QAT_RSA_PRIV_ENC, ERR_R_MALLOC_FAILURE);
+ sts = 0;
+ goto exit_lenstra;
+ }
+# ifdef ENABLE_QAT_HW_LENSTRA_VERIFY_HW
+ lenstra_ret = qat_rsa_pub_dec(rsa_len, (const unsigned char *)to,
+ ver_msg, rsa, padding);
+# else
+ lenstra_ret = RSA_meth_get_pub_dec(RSA_PKCS1_OpenSSL())
+ (rsa_len,
+ (const unsigned char *)to,
+ ver_msg, rsa, padding);
+# endif
+ if ((lenstra_ret <= 0) || (CRYPTO_memcmp(from, ver_msg, flen) != 0)) {
+ WARN("QAT RSA Verify failed - redoing sign operation in s/w\n");
  OPENSSL_free(ver_msg);
- return RSA_meth_get_priv_enc(RSA_PKCS1_OpenSSL())(flen, from, to, rsa, padding);
+ return RSA_meth_get_priv_enc(RSA_PKCS1_OpenSSL())
+ (flen, from, to, rsa, padding);
  }
  OPENSSL_free(ver_msg);
  }
@@ -1050,6 +1059,7 @@ int qat_rsa_priv_dec(int flen, const unsigned char *from,
  const BIGNUM *n = NULL;
  const BIGNUM *e = NULL;
  const BIGNUM *d = NULL;
+ int lenstra_ret = 0;
 #endif
 
  DEBUG("- Started.\n");
@@ -1110,10 +1120,18 @@ int qat_rsa_priv_dec(int flen, const unsigned char *from,
  sts = 0;
  goto exit;
  }
- if ((RSA_meth_get_pub_enc(RSA_PKCS1_OpenSSL())
- (rsa_len, (const unsigned char *)output_buffer->pData, ver_msg, rsa, RSA_NO_PADDING) <= 0)
- || (CRYPTO_memcmp(from, ver_msg, flen) != 0)) {
- WARN("- Verify of offloaded decrypt operation failed - redoing decrypt operation in s/w\n");
+# ifdef ENABLE_QAT_HW_LENSTRA_VERIFY_HW
+ lenstra_ret = qat_rsa_pub_enc(rsa_len,
+ (const unsigned char *)output_buffer->pData,
+ ver_msg, rsa, RSA_NO_PADDING);
+# else
+ lenstra_ret = RSA_meth_get_pub_enc(RSA_PKCS1_OpenSSL())
+ (rsa_len,
+ (const unsigned char *)output_buffer->pData,
+ ver_msg, rsa, RSA_NO_PADDING);
+# endif
+ if ((lenstra_ret <= 0) || (CRYPTO_memcmp(from, ver_msg, flen) != 0)) {
+ WARN("- QAT RSA sign failed - redoing decrypt operation in s/w\n");
  OPENSSL_free(ver_msg);
  rsa_decrypt_op_buf_free(dec_op_data, output_buffer);
  return RSA_meth_get_priv_dec(RSA_PKCS1_OpenSSL())(flen, from, to, rsa, padding);