Fix compilation error with latest BoringSSL Commit.

Signed-off-by: Chen Tingkai <tingkai.chen@intel.com>

configure.ac

@@ -332,6 +332,15 @@ then
       fi
       AC_SUBST([QAT_BORINGSSL_LIB], ["-Wl,-rpath,\$(with_openssl_install_dir)/lib -L\$(with_openssl_install_dir)/lib -ldecrepit -lcrypto -lssl"])
       AC_SUBST([LIBQATNAME], "libqatengine")
+      CFLAGS_BACK="${CFLAGS}"
+      CFLAGS="-I${with_openssl_install_dir}/include/ -I${with_openssl_install_dir}/include/openssl/ ${CFLAGS}"
+      AC_CHECK_TYPE([struct evp_pkey_st], [], [AC_MSG_ERROR([need specified version for BoringSSL commit:15596efa5f])], [
+                     AC_INCLUDES_DEFAULT
+                     #include <openssl/evp.h>])
+      AC_CHECK_MEMBERS([struct evp_pkey_st.references, struct evp_pkey_st.type, struct evp_pkey_st.pkey.ptr, struct evp_pkey_st.pkey.rsa,
+                        struct evp_pkey_st.pkey.dsa, struct evp_pkey_st.pkey.dh, struct evp_pkey_st.pkey.ec, struct evp_pkey_st.ameth],
+                        [], [need specified version for BoringSSL commit:15596efa5f], [#include <openssl/evp.h>])
+      CFLAGS="${CFLAGS_BACK}"
       if test -d "$with_openssl_install_dir/crypto"
       then
         AC_SUBST([cflags_boringssl], ["-DQAT_BORINGSSL -DBSSL_SOURCE"])

e_qat.c

@@ -116,7 +116,9 @@
 #endif
 
 #ifdef QAT_SW_IPSEC
+#ifndef QAT_BORINGSSL
 # include "qat_sw_gcm.h"
+#endif /* QAT_BORINGSSL */
 #endif
 
 /* OpenSSL Includes */

qat_evp.c

@@ -73,7 +73,9 @@
 #endif
 
 #ifdef QAT_SW_IPSEC
+# ifndef QAT_BORINGSSL
 # include "qat_sw_gcm.h"
+#endif /* QAT_BORINGSSL */
 #endif
 
 #ifdef QAT_SW
@@ -84,13 +86,17 @@
 # include "qat_sw_ec.h"
 # include "qat_sw_rsa.h"
 # include "qat_sw_sm3.h"
+# ifndef QAT_BORINGSSL
 # include "qat_sw_sm4_cbc.h"
 # include "qat_sw_sm4_gcm.h"
 # include "qat_sw_sm4_ccm.h"
 # include "crypto_mb/sm4.h"
+# endif /* QAT_BORINGSSL */
 # include "crypto_mb/cpu_features.h"
+# ifndef QAT_BORINGSSL
 # include "crypto_mb/sm4_gcm.h"
 # include "crypto_mb/sm4_ccm.h"
+# endif /* QAT_BORINGSSL */
 #endif
 
 #ifdef QAT_HW_INTREE

qat_sw_init.c

@@ -74,7 +74,9 @@
 #include "qat_sw_ecx.h"
 #include "qat_sw_ec.h"
 #include "qat_sw_sm3.h"
+#ifndef QAT_BORINGSSL
 #include "qat_sw_sm4_cbc.h"
+#endif /* QAT_BORINGSSL */
 #include "qat_sw_request.h"
 #include "qat_sw_freelist.h"
 #include "qat_sw_queue.h"

qat_sw_polling.c

@@ -68,9 +68,11 @@
 #include "qat_sw_ec.h"
 #include "qat_utils.h"
 #include "qat_sw_sm3.h"
+#ifndef QAT_BORINGSSL
 #include "qat_sw_sm4_cbc.h"
 #include "qat_sw_sm4_gcm.h"
 #include "qat_sw_sm4_ccm.h"
+#endif /* QAT_BORINGSSL */
 
 /* OpenSSL Includes */
 #include <openssl/err.h>