import librepo-1.12.0-3.el8
This commit is contained in:
parent
9e63330847
commit
6072397a8c
@ -0,0 +1,40 @@
|
|||||||
|
From 1e7673d07308081f13e7bb1829cfed2ccd865ea0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Masahiro Matsuya <mmatsuya@redhat.com>
|
||||||
|
Date: Fri, 13 Nov 2020 17:37:59 +0100
|
||||||
|
Subject: [PATCH] Add support for pkcs11 certificate and key for repository
|
||||||
|
authorization
|
||||||
|
|
||||||
|
msg: Add support for pkcs11 certificate and key for repository authorization
|
||||||
|
type: enhancement
|
||||||
|
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1859495
|
||||||
|
---
|
||||||
|
librepo/handle.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/librepo/handle.c b/librepo/handle.c
|
||||||
|
index d8728c4..33edf5d 100644
|
||||||
|
--- a/librepo/handle.c
|
||||||
|
+++ b/librepo/handle.c
|
||||||
|
@@ -649,6 +649,9 @@ lr_handle_setopt(LrHandle *handle,
|
||||||
|
lr_free(handle->sslclientcert);
|
||||||
|
handle->sslclientcert = g_strdup(va_arg(arg, char *));
|
||||||
|
c_rc = curl_easy_setopt(c_h, CURLOPT_SSLCERT, handle->sslclientcert);
|
||||||
|
+ if (c_rc == CURLE_OK && handle->sslclientcert && !strncasecmp(handle->sslclientcert, "pkcs11:", 7)) {
|
||||||
|
+ c_rc = curl_easy_setopt(c_h, CURLOPT_SSLCERTTYPE, "ENG");
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
|
||||||
|
case LRO_SSLCLIENTKEY:
|
||||||
|
@@ -656,6 +659,9 @@ lr_handle_setopt(LrHandle *handle,
|
||||||
|
lr_free(handle->sslclientkey);
|
||||||
|
handle->sslclientkey = g_strdup(va_arg(arg, char *));
|
||||||
|
c_rc = curl_easy_setopt(c_h, CURLOPT_SSLKEY, handle->sslclientkey);
|
||||||
|
+ if (c_rc == CURLE_OK && handle->sslclientkey && !strncasecmp(handle->sslclientkey, "pkcs11:", 7)) {
|
||||||
|
+ c_rc = curl_easy_setopt(c_h, CURLOPT_SSLKEYTYPE, "ENG");
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
|
||||||
|
case LRO_SSLCACERT:
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
Name: librepo
|
Name: librepo
|
||||||
Version: 1.12.0
|
Version: 1.12.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Repodata downloading library
|
Summary: Repodata downloading library
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -35,6 +35,7 @@ URL: https://github.com/rpm-software-management/librepo
|
|||||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch1: 0001-Validate-path-read-from-repomd.xml-RhBug-1866498.patch
|
Patch1: 0001-Validate-path-read-from-repomd.xml-RhBug-1866498.patch
|
||||||
|
Patch2: 0002-Add-support-for-pkcs11-certificate-and-key-for-repos.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -192,6 +193,9 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 15 2020 Marek Blaha <mblaha@redhat.com> - 1.12.0-3
|
||||||
|
- Add support for pkcs11 certificate and key for repository authorization (RhBug:1859495)
|
||||||
|
|
||||||
* Mon Aug 17 2020 Ales Matej <amatej@redhat.com> - 1.12.0-2
|
* Mon Aug 17 2020 Ales Matej <amatej@redhat.com> - 1.12.0-2
|
||||||
- Validate paths read from repomd.xml (RhBug:1866505)
|
- Validate paths read from repomd.xml (RhBug:1866505)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user