Attachment 3685 Details for Bug 3548 – My take

[patch] My take

bz3548.diff (text/plain), 1.39 KB, created by Damien Miller on 2023-03-15 10:14:31 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2023-03-15 10:14:31 AEDT

Size: 1.39 KB

patch

obsolete

>diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
>index a37ca61b..7d7162b2 100644
>--- a/openbsd-compat/openssl-compat.c
>+++ b/openbsd-compat/openssl-compat.c
>@@ -48,21 +48,28 @@ 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 */
>-		return (headerver & mask) == (libver & mask);
>-	}
>-
> 	/*
>-	 * For versions >= 1.0.0, major,minor,status must match and library
>+	 * For versions < 3.0.0, 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;
>-	lfix = (libver & 0x000ff000) >> 12;
>+	if (headerver < 0x3000000f) {
>+		mask = 0xfff0000fL; /* major,minor,status */
>+		hfix = (headerver & 0x000ff000) >> 12;
>+		lfix = (libver & 0x000ff000) >> 12;
>+		if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
>+			return 1;
>+	}
>+
>+	/*
>+	 * For versions >= 3.0.0, major must match and minor,status must be
>+	 * equal to or greater than the header.
>+	 */
>+	mask = 0xf000000fL; /* major, status */
>+	hfix = (headerver & 0x0ffffff0L) >> 12;
>+	lfix = (libver & 0x0ffffff0L) >> 12;
> 	if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
> 		return 1;
>+
> 	return 0;
> }
>

Actions: View | Diff

Attachments on bug 3548: 3684 | 3685