Merge branch 'cherry-pick-v1.13.2' into 'release-1.13'

Merge branch 'libpks-openssl3' into 'main' See merge request nvidia/container-toolkit/libnvidia-container!217
NVIDIA · Jun 6, 2023 · f9624c1 · f9624c1
2 parents f4d9b62 + 56c329f
commit f9624c1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pkg/deb/changelog b/pkg/deb/changelog
@@ -1,8 +1,8 @@
 libnvidia-container (1.13.2-1) UNRELEASED; urgency=medium
 
- * Bump version to 1.13.2
+ * Support OpenSSL 3 with the Encrypt/Decrypt library
 
- -- NVIDIA CORPORATION <cudatools@nvidia.com>  Fri, 26 May 2023 15:18:12 +0200
+ -- NVIDIA CORPORATION <cudatools@nvidia.com>  Tue, 06 Jun 2023 16:14:47 +0200
 
 libnvidia-container (1.13.1-1) UNRELEASED; urgency=medium
 

diff --git a/pkg/rpm/SPECS/libnvidia-container.spec b/pkg/rpm/SPECS/libnvidia-container.spec
@@ -99,8 +99,8 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
-* Fri May 26 2023 NVIDIA CORPORATION <cudatools@nvidia.com> 1.13.2-1
-- Bump version to 1.13.2
+* Tue Jun 06 2023 NVIDIA CORPORATION <cudatools@nvidia.com> 1.13.2-1
+- Support OpenSSL 3 with the Encrypt/Decrypt library
 
 * Thu Apr 13 2023 NVIDIA CORPORATION <cudatools@nvidia.com> 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 */
 };