Dockerfile version bump for v2.0.0

- Bumped the Dockerfile version reference to v2.0.0.
- Removed unused header includes and obsolete structures
  from qat_prov_kmgmt_ec_utils.h.

Signed-off-by: Krithika Kumaravelu <[email protected]>
Co-authored-by: Jaya Naga Venkata Sudhakar <[email protected]>

Author: 2 people

dockerfiles/haproxy/Dockerfile

@@ -40,9 +40,9 @@ FROM ${UBUNTU_BASE} AS builder
 
 ARG OPENSSL_VERSION="openssl-3.0.16"
 ARG QATLIB_VERSION="24.02.0"
-ARG QAT_ENGINE_VERSION="v1.9.0"
+ARG QAT_ENGINE_VERSION="v2.0.0"
 ARG IPSEC_MB_VERSION="v2.0"
-ARG IPP_CRYPTO_VERSION="v1.1.0"
+ARG IPP_CRYPTO_VERSION="v1.2.0"
 ARG HAPROXY_VERSION="v2.8.0"
 ARG GID
 ENV DEBIAN_FRONTEND=noninteractive
@@ -160,7 +160,7 @@ COPY --from=builder /usr/local/lib/libqat.so.4.2.0 /usr/lib/
 COPY --from=builder /usr/local/lib/libusdm.so.0.1.0 /usr/lib/
 COPY --from=builder /usr/local/lib/libIPSec_MB.so.2.0.0 /usr/lib/x86_64-linux-gnu/
 COPY --from=builder /usr/local/lib64/libcrypto.so.3 /usr/lib/x86_64-linux-gnu/
-COPY --from=builder /usr/local/lib/intel64/libcrypto_mb.so.12.1 /usr/lib/x86_64-linux-gnu/
+COPY --from=builder /usr/local/lib/intel64/libcrypto_mb.so.12.2 /usr/lib/x86_64-linux-gnu/
 COPY --from=builder /usr/local/bin/openssl /usr/bin/
 COPY --from=builder /usr/local/lib64/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
 COPY --from=builder /etc/group /etc/group

dockerfiles/qat_crypto_base/Dockerfile

@@ -40,9 +40,9 @@ FROM ${UBUNTU_BASE} AS builder
 
 ARG OPENSSL_VERSION="openssl-3.0.16"
 ARG QATLIB_VERSION="24.02.0"
-ARG QAT_ENGINE_VERSION="v1.9.0"
+ARG QAT_ENGINE_VERSION="v2.0.0"
 ARG IPSEC_MB_VERSION="v2.0"
-ARG IPP_CRYPTO_VERSION="v1.1.0"
+ARG IPP_CRYPTO_VERSION="v1.2.0"
 ARG GID
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -145,7 +145,7 @@ COPY --from=builder /usr/local/lib/libqat.so.4.2.0 /usr/lib/
 COPY --from=builder /usr/local/lib/libusdm.so.0.1.0 /usr/lib/
 COPY --from=builder /usr/local/lib/libIPSec_MB.so.2.0.0  /usr/lib/x86_64-linux-gnu/
 COPY --from=builder /usr/local/lib64/libcrypto.so.3 /usr/lib/x86_64-linux-gnu/
-COPY --from=builder /usr/local/lib/intel64/libcrypto_mb.so.12.1 /usr/lib/x86_64-linux-gnu/
+COPY --from=builder /usr/local/lib/intel64/libcrypto_mb.so.12.2 /usr/lib/x86_64-linux-gnu/
 COPY --from=builder /usr/local/bin/openssl /usr/bin/
 COPY --from=builder /usr/local/lib64/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/
 COPY --from=builder /etc/group /etc/group

qat_prov_kmgmt_ec_utils.h

@@ -50,8 +50,6 @@
 # define _GNU_SOURCE
 #endif
 
-#include <openssl/engine.h>
-
 #if defined(ENABLE_QAT_HW_ECDH) || defined(ENABLE_QAT_SW_ECDH)
 #define COPY_INT_PARAM(params, key, val)                                       \
 p = OSSL_PARAM_locate_const(params, key);                                      \
@@ -182,58 +180,6 @@ struct bignum_st {
     int flags;
 };
 
-typedef void (*ENGINE_DYNAMIC_ID)(void);
-
-/*
- * This is a structure for storing implementations of various crypto
- * algorithms and functions.
- */
-struct engine_st {
-    const char *id;
-    const char *name;
-    const RSA_METHOD *rsa_meth;
-    const DSA_METHOD *dsa_meth;
-    const DH_METHOD *dh_meth;
-    const EC_KEY_METHOD *ec_meth;
-    const RAND_METHOD *rand_meth;
-    /* Cipher handling is via this callback */
-    ENGINE_CIPHERS_PTR ciphers;
-    /* Digest handling is via this callback */
-    ENGINE_DIGESTS_PTR digests;
-    /* Public key handling via this callback */
-    ENGINE_PKEY_METHS_PTR pkey_meths;
-    /* ASN1 public key handling via this callback */
-    ENGINE_PKEY_ASN1_METHS_PTR pkey_asn1_meths;
-    ENGINE_GEN_INT_FUNC_PTR destroy;
-    ENGINE_GEN_INT_FUNC_PTR init;
-    ENGINE_GEN_INT_FUNC_PTR finish;
-    ENGINE_CTRL_FUNC_PTR ctrl;
-    ENGINE_LOAD_KEY_PTR load_privkey;
-    ENGINE_LOAD_KEY_PTR load_pubkey;
-    ENGINE_SSL_CLIENT_CERT_PTR load_ssl_client_cert;
-    const ENGINE_CMD_DEFN *cmd_defns;
-    int flags;
-    /* reference count on the structure itself */
-    QAT_CRYPTO_REF_COUNT struct_ref;
-    /*
-     * reference count on usability of the engine type. NB: This controls the
-     * loading and initialisation of any functionality required by this
-     * engine, whereas the previous count is simply to cope with
-     * (de)allocation of this structure. Hence, running_ref <= struct_ref at
-     * all times.
-     */
-    int funct_ref;
-    /* A place to store per-ENGINE data */
-    CRYPTO_EX_DATA ex_data;
-    /* Used to maintain the linked-list of engines. */
-    struct engine_st *prev;
-    struct engine_st *next;
-    /* Used to maintain the linked-list of dynamic engines. */
-    struct engine_st *prev_dyn;
-    struct engine_st *next_dyn;
-    ENGINE_DYNAMIC_ID dynamic_id;
-};
-
 /*
  * This prints the engine's pointer address, "struct" or "funct" to
  * indicate the reference type, the before and after reference count, and