forked from pool/openssl-1_1
Accepting request 1183229 from security:tls
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/1183229 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-1_1?expand=0&rev=60
This commit is contained in:
commit
2cb6568415
@ -327,7 +327,7 @@ index 9895aa8..77a1c77 100644
|
||||
- err:
|
||||
+ /* extract r and s */
|
||||
+ tsig = sig;
|
||||
+ dsa_sig = d2i_ECDSA_SIG(NULL, &tsig, siglen);
|
||||
+ dsa_sig = d2i_ECDSA_SIG(NULL, (const unsigned char **) &tsig, siglen);
|
||||
+ if (dsa_sig == NULL)
|
||||
+ goto err;
|
||||
+
|
||||
|
@ -4,8 +4,10 @@
|
||||
crypto/evp/c_alld.c | 6 +++++-
|
||||
3 files changed, 52 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/crypto/asn1/ameth_lib.c
|
||||
+++ b/crypto/asn1/ameth_lib.c
|
||||
Index: openssl-1.1.1w/crypto/asn1/ameth_lib.c
|
||||
===================================================================
|
||||
--- openssl-1.1.1w.orig/crypto/asn1/ameth_lib.c
|
||||
+++ openssl-1.1.1w/crypto/asn1/ameth_lib.c
|
||||
@@ -35,7 +35,11 @@ IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_P
|
||||
|
||||
int EVP_PKEY_asn1_get_count(void)
|
||||
@ -52,8 +54,10 @@
|
||||
if (!ret || !*ret)
|
||||
return NULL;
|
||||
return *ret;
|
||||
--- a/crypto/asn1/standard_methods.h
|
||||
+++ b/crypto/asn1/standard_methods.h
|
||||
Index: openssl-1.1.1w/crypto/asn1/standard_methods.h
|
||||
===================================================================
|
||||
--- openssl-1.1.1w.orig/crypto/asn1/standard_methods.h
|
||||
+++ openssl-1.1.1w/crypto/asn1/standard_methods.h
|
||||
@@ -59,3 +59,32 @@ static const EVP_PKEY_ASN1_METHOD *stand
|
||||
#endif
|
||||
};
|
||||
@ -87,9 +91,18 @@
|
||||
+ &dhx_asn1_meth,
|
||||
+#endif
|
||||
+};
|
||||
--- a/crypto/evp/c_alld.c
|
||||
+++ b/crypto/evp/c_alld.c
|
||||
@@ -17,7 +17,11 @@
|
||||
Index: openssl-1.1.1w/crypto/evp/c_alld.c
|
||||
===================================================================
|
||||
--- openssl-1.1.1w.orig/crypto/evp/c_alld.c
|
||||
+++ openssl-1.1.1w/crypto/evp/c_alld.c
|
||||
@@ -11,13 +11,18 @@
|
||||
#include "internal/cryptlib.h"
|
||||
#include <openssl/evp.h>
|
||||
#include "crypto/evp.h"
|
||||
+#include "crypto/fips_int.h"
|
||||
#include <openssl/pkcs12.h>
|
||||
#include <openssl/objects.h>
|
||||
|
||||
void openssl_add_all_digests_int(void)
|
||||
{
|
||||
#ifdef OPENSSL_FIPS
|
||||
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 18 15:52:49 UTC 2024 - Martin Jambor <mjambor@suse.com>
|
||||
|
||||
- Fixed C99 violations in patches bsc1185319-FIPS-KAT-for-ECDSA.patch
|
||||
(need to for explicity typecast) and
|
||||
openssl-1_1-fips-list-only-approved-digest-and-pubkey-algorithms.patch
|
||||
(missing include) to allow the package to build with GCC 14.
|
||||
[boo#1225907]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 6 12:11:02 UTC 2024 - Otto Hollmann <otto.hollmann@suse.com>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user