Merge branch 'libpks-openssl3' into 'main'

Support OpenSSL 3 with the Encrypt/Decrypt library See merge request nvidia/container-toolkit/libnvidia-container!216
NVIDIA · Jun 6, 2023 · cd0f408 · cd0f408
2 parents 2632174 + 40d3417
commit cd0f408
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/pkg/deb/changelog b/pkg/deb/changelog
@@ -1,6 +1,7 @@
 libnvidia-container (1.14.0~rc.1-1) experimental; urgency=medium
 
   * Remove linvidia-container0 dependency on Ubuntu-based arm64 platforms
+  * Support OpenSSL 3 with the Encrypt/Decrypt library
 
  -- NVIDIA CORPORATION <[email protected]>  Mon, 24 Apr 2023 17:30:18 +0200
 

diff --git a/pkg/rpm/SPECS/libnvidia-container.spec b/pkg/rpm/SPECS/libnvidia-container.spec
@@ -101,6 +101,7 @@ This package contains command-line tools that facilitate using the library.
 %changelog
 * Mon Apr 24 2023 NVIDIA CORPORATION <[email protected]> 1.14.0-rc.1-1
 - Remove linvidia-container0 dependency on Ubuntu-based arm64 platforms
+- Support OpenSSL 3 with the Encrypt/Decrypt library
 
 * Thu Apr 13 2023 NVIDIA CORPORATION <[email protected]> 1.13.1-1
 - Bump version to 1.13.1

diff --git a/src/nvc_info.c b/src/nvc_info.c
@@ -88,6 +88,7 @@ static const char * const compute_libs[] = {
         "libnvidia-allocator.so",           /* NVIDIA allocator runtime library */
         "libnvidia-compiler.so",            /* NVVM-PTX compiler for OpenCL (used by libnvidia-opencl) */
         "libnvidia-pkcs11.so",              /* Encrypt/Decrypt library */
+        "libnvidia-pkcs11-openssl3.so",     /* Encrypt/Decrypt library (OpenSSL 3 support) */
         "libnvidia-nvvm.so",                /* The NVVM Compiler library */
 };