OpenSSL 3.0: fix RSA key-generation test

Resolves: rhbz#1964837

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2021-05-26 10:57:10 -04:00
parent 516bc844e5
commit 2db8955928
2 changed files with 59 additions and 1 deletions

View File

@ -0,0 +1,52 @@
From 696979f3ab82a8540a8a08fa84a2e11e057fe0b1 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 26 May 2021 08:36:19 -0400
Subject: [PATCH] Fix exponent list in test
One of the exponents was a typo (7 instead of 17). 17 is no longer
recommended as of OpenSSL 3.0, so drop it and replace the other
exponents with their rsa.h aliases.
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
include/sscg.h | 2 +-
test/generate_rsa_key_test.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/sscg.h b/include/sscg.h
index 96b78152ccc492deafbbc61eb98702562a8fe5e6..10f9a2c2b38e4ff0bb266e7f5bed36b934382c6d 100644
--- a/include/sscg.h
+++ b/include/sscg.h
@@ -46,11 +46,11 @@
#ifndef EOK
#define EOK 0
#endif
#ifndef discard_const
-#define discard_const(ptr) ((void *)((uintptr_t) (ptr)))
+#define discard_const(ptr) ((void *)((uintptr_t)(ptr)))
#endif
#ifndef talloc_zfree
#define talloc_zfree(ptr) \
do \
diff --git a/test/generate_rsa_key_test.c b/test/generate_rsa_key_test.c
index 304b2d3707e41c178cbe4bb5948d50400f0fca84..c8435d971c27a1b8ef8f0417d19747b89a4dc66f 100644
--- a/test/generate_rsa_key_test.c
+++ b/test/generate_rsa_key_test.c
@@ -30,11 +30,11 @@ main (int argc, char **argv)
{
int ret, sret;
struct sscg_bignum *e;
struct sscg_evp_pkey *pkey;
size_t i, j;
- unsigned long exp_list[] = { 3, 7, 65537, 0 };
+ unsigned long exp_list[] = { RSA_3, RSA_F4, 0 };
int bits[] = { 512, 1024, 2048, 4096, 0 };
TALLOC_CTX *tmp_ctx = talloc_new (NULL);
if (!tmp_ctx)
{
--
2.31.1

View File

@ -9,7 +9,7 @@
Name: sscg
Version: 2.6.2
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Simple SSL certificate generator
License: GPLv3+ with exceptions
@ -25,6 +25,8 @@ BuildRequires: meson
BuildRequires: ninja-build
BuildRequires: help2man
Patch0001: 0001-Fix-exponent-list-in-test.patch
%description
A utility to aid in the creation of more secure "self-signed"
@ -55,6 +57,10 @@ false signatures from the service certificate.
%{_mandir}/man8/%{name}.8*
%changelog
* Wed May 26 2021 Stephen Gallagher <sgallagh@redhat.com> - 2.6.2-7
- OpenSSL 3.0 compatibility: fix RSA key-generation test
- Resolves: rhbz#1964837
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.6.2-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937