Attachment 3684 Details for Bug 3548 – Update OpenSSL version check for v3 policy. Remove <1 since we no longer support them.

[patch] Update OpenSSL version check for v3 policy. Remove <1 since we no longer support them.

openssh-openssl-version-compat.patch (text/plain), 1.58 KB, created by Darren Tucker on 2023-03-15 09:39:31 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2023-03-15 09:39:31 AEDT

Size: 1.58 KB

patch

obsolete

>diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
>index a37ca61bf..6c65003f2 100644
>--- a/openbsd-compat/openssl-compat.c
>+++ b/openbsd-compat/openssl-compat.c
>@@ -33,10 +33,10 @@
> 
> /*
>  * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
>- * We match major, minor, fix and status (not patch) for <1.0.0.
>- * After that, we acceptable compatible fix versions (so we
>- * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
>- * within a patch series.
>+ * Versions >=3 require only major versions to match.
>+ * For versions <3, we accept compatible fix versions (so we allow 1.0.1
>+ * to work with 1.0.0). Going backwards is only allowed within a patch series.
>+ * See https://www.openssl.org/policies/releasestrat.html
>  */
> 
> int
>@@ -48,15 +48,17 @@ ssh_compatible_openssl(long headerver, long libver)
> 	if (headerver == libver)
> 		return 1;
> 
>-	/* for versions < 1.0.0, major,minor,fix,status must match */
>-	if (headerver < 0x1000000f) {
>-		mask = 0xfffff00fL; /* major,minor,fix,status */
>+	/*
>+	 * For versions >= 3.0, only the major and status must match.
>+	 */
>+	if (headerver >= 0x3000000f) {
>+		mask = 0xf000000fL; /* major,status */
> 		return (headerver & mask) == (libver & mask);
> 	}
> 
> 	/*
>-	 * For versions >= 1.0.0, major,minor,status must match and library
>-	 * fix version must be equal to or newer than the header.
>+	 * For versions >= 1.0.0, but <3, major,minor,status must match and
>+	 * library fix version must be equal to or newer than the header.
> 	 */
> 	mask = 0xfff0000fL; /* major,minor,status */
> 	hfix = (headerver & 0x000ff000) >> 12;

Flags:

dtucker: ok? (djm)
djm: ok+

Actions: View | Diff

Attachments on bug 3548: 3684 | 3685