Attachment 246458 Details for Bug 272835 – patch to fix base heimdal and weak enctypes with base openssl-3.0.x v2

[patch] patch to fix base heimdal and weak enctypes with base openssl-3.0.x v2

heimdal.patch (text/plain), 2.38 KB, created by Joerg Pulz on 2023-11-21 09:24:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joerg Pulz

Created: 2023-11-21 09:24:54 UTC

Size: 2.38 KB

patch

obsolete

>diff --git a/crypto/heimdal/lib/krb5/crypto.c b/crypto/heimdal/lib/krb5/crypto.c
>index 67ecef62e875..f5cdc5a7edfc 100644
>--- a/crypto/heimdal/lib/krb5/crypto.c
>+++ b/crypto/heimdal/lib/krb5/crypto.c
>@@ -2054,6 +2054,10 @@ krb5_crypto_init(krb5_context context,
> 	*crypto = NULL;
> 	return ret;
>     }
>+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
>+    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)
>+	return EINVAL;
>+#endif
>     (*crypto)->key.schedule = NULL;
>     (*crypto)->num_key_usage = 0;
>     (*crypto)->key_usage = NULL;
>diff --git a/crypto/heimdal/lib/krb5/salt.c b/crypto/heimdal/lib/krb5/salt.c
>index 5e4c8a1c8572..3c40ee745537 100644
>--- a/crypto/heimdal/lib/krb5/salt.c
>+++ b/crypto/heimdal/lib/krb5/salt.c
>@@ -43,6 +43,11 @@ krb5_salttype_to_string (krb5_context context,
>     struct _krb5_encryption_type *e;
>     struct salt_type *st;
> 
>+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
>+    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)
>+	return EINVAL;
>+#endif
>+
>     e = _krb5_find_enctype (etype);
>     if (e == NULL) {
> 	krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP,
>@@ -75,6 +80,11 @@ krb5_string_to_salttype (krb5_context context,
>     struct _krb5_encryption_type *e;
>     struct salt_type *st;
> 
>+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
>+    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)
>+	return EINVAL;
>+#endif
>+
>     e = _krb5_find_enctype (etype);
>     if (e == NULL) {
> 	krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP,
>@@ -196,6 +206,10 @@ krb5_string_to_key_data_salt_opaque (krb5_context context,
> 			       enctype);
> 	return KRB5_PROG_ETYPE_NOSUPP;
>     }
>+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
>+    if (OSSL_PROVIDER_load(NULL, "legacy") == NULL)
>+	return EINVAL;
>+#endif
>     for(st = et->keytype->string_to_key; st && st->type; st++)
> 	if(st->type == salt.salttype)
> 	    return (*st->string_to_key)(context, enctype, password,
>diff --git a/kerberos5/include/crypto-headers.h b/kerberos5/include/crypto-headers.h
>index 3ae0d9624ffd..a5daa36cbf55 100644
>--- a/kerberos5/include/crypto-headers.h
>+++ b/kerberos5/include/crypto-headers.h
>@@ -17,5 +17,8 @@
> #include <openssl/ec.h>
> #include <openssl/ecdsa.h>
> #include <openssl/ecdh.h>
>+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
>+#include <openssl/provider.h>
>+#endif
> 
> #endif /* __crypto_headers_h__ */

Actions: View | Diff

Attachments on bug 272835: 246375 | 246458 | 246893 | 246909 | 246930 | 246994 | 246998 | 247680 | 247710 | 247730