CVS commit: pkgsrc/security/openssl

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 30 11:21:58 UTC 2020

Modified Files:
        pkgsrc/security/openssl: Makefile distinfo
Added Files:
        pkgsrc/security/openssl/patches: patch-crypto_rand_rand__unix.c

Log Message:
openssl: Fix KERN_ARND usage on NetBSD.

XXX upstream


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.140 -r1.141 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.257 pkgsrc/security/openssl/Makefile:1.258
--- pkgsrc/security/openssl/Makefile:1.257      Tue Apr 21 13:29:35 2020
+++ pkgsrc/security/openssl/Makefile    Thu Apr 30 11:21:57 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.257 2020/04/21 13:29:35 sevan Exp $
+# $NetBSD: Makefile,v 1.258 2020/04/30 11:21:57 nia Exp $
 
 DISTNAME=      openssl-1.1.1g
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  https://www.openssl.org/source/
 

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.140 pkgsrc/security/openssl/distinfo:1.141
--- pkgsrc/security/openssl/distinfo:1.140      Tue Apr 21 13:29:35 2020
+++ pkgsrc/security/openssl/distinfo    Thu Apr 30 11:21:57 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.140 2020/04/21 13:29:35 sevan Exp $
+$NetBSD: distinfo,v 1.141 2020/04/30 11:21:57 nia Exp $
 
 SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
 RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
 SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
 Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
+SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956

Added files:

Index: pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.c
diff -u /dev/null pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.c:1.1
--- /dev/null   Thu Apr 30 11:21:58 2020
+++ pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.c      Thu Apr 30 11:21:57 2020
@@ -0,0 +1,47 @@
+$NetBSD: patch-crypto_rand_rand__unix.c,v 1.1 2020/04/30 11:21:57 nia Exp $
+
+Fix usage of KERN_ARND on NetBSD.
+
+First, actually include the correct headers.
+Second, disable a hack for old FreeBSD versions (just in case it gets used).
+Third, ensure that we don't ever request more than 256 bytes (just in case).
+
+--- crypto/rand/rand_unix.c.orig       2020-04-21 12:22:39.000000000 +0000
++++ crypto/rand/rand_unix.c
+@@ -26,12 +26,12 @@
+ #  include <sys/utsname.h>
+ # endif
+ #endif
+-#if defined(__FreeBSD__) && !defined(OPENSSL_SYS_UEFI)
++#if (defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(OPENSSL_SYS_UEFI)
+ # include <sys/types.h>
+ # include <sys/sysctl.h>
+ # include <sys/param.h>
+ #endif
+-#if defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__)
+ # include <sys/param.h>
+ #endif
+ 
+@@ -247,10 +247,12 @@ static ssize_t sysctl_random(char *buf, 
+      * when the sysctl returns long and we want to request something not a
+      * multiple of longs, which should never be the case.
+      */
++#if   defined(__FreeBSD__)
+     if (!ossl_assert(buflen % sizeof(long) == 0)) {
+         errno = EINVAL;
+         return -1;
+     }
++#endif
+ 
+     /*
+      * On NetBSD before 4.0 KERN_ARND was an alias for KERN_URND, and only
+@@ -268,7 +270,7 @@ static ssize_t sysctl_random(char *buf, 
+     mib[1] = KERN_ARND;
+ 
+     do {
+-        len = buflen;
++        len = buflen > 256 ? 256 : buflen;
+         if (sysctl(mib, 2, buf, &len, NULL, 0) == -1)
+             return done > 0 ? done : -1;
+         done += len;