cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we have a local OPENSSL_NO_SHA0; use that instead of LIBRESSL_VERSION_NUMBER

Browse Source
This commit is contained in:
sthen 2015-09-16 10:43:18 +00:00
parent 2e762a9ae3
commit 47e3fd6884
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ssvnc/patches/patch-vncstorepw_ultravnc_dsm_helper_c
View File

@ -1,6 +1,9 @@
$OpenBSD: patch-vncstorepw_ultravnc_dsm_helper_c,v 1.1 2015/09/16 10:29:43 sthen Exp $
$OpenBSD: patch-vncstorepw_ultravnc_dsm_helper_c,v 1.2 2015/09/16 10:43:18 sthen Exp $
LibreSSL 2.3 gets rid of SHA-0 (EVP_sha). There is no suitable OPENSSL_NO_xxx.
LibreSSL 2.3 gets rid of SHA-0 (EVP_sha).
OpenSSL has no targetted way to disable this, thus OPENSSL_NO_SHA0 is
LibreSSL-only at prsent.
--- vncstorepw/ultravnc_dsm_helper.c.orig Thu Apr 22 22:29:43 2010
+++ vncstorepw/ultravnc_dsm_helper.c Wed Sep 16 04:27:01 2015
@ -8,7 +11,7 @@ LibreSSL 2.3 gets rid of SHA-0 (EVP_sha). There is no suitable OPENSSL_NO_xxx.
p++;
if (strstr(p, "md5+") == p) {
Digest = EVP_md5(); p += strlen("md5+");
+#if !(LIBRESSL_VERSION_NUMBER >= 0x20030000L)
+#ifndef OPENSSL_NO_SHA0
} else if (strstr(p, "sha+") == p) {
Digest = EVP_sha(); p += strlen("sha+");
+#endif

9
x11/x11vnc/patches/patch-x11vnc_enc_h
View File

@ -1,6 +1,9 @@
$OpenBSD: patch-x11vnc_enc_h,v 1.1 2015/09/16 10:36:08 sthen Exp $
$OpenBSD: patch-x11vnc_enc_h,v 1.2 2015/09/16 10:43:18 sthen Exp $
LibreSSL 2.3 gets rid of SHA-0 (EVP_sha). There is no suitable OPENSSL_NO_xxx.
LibreSSL 2.3 gets rid of SHA-0 (EVP_sha).
OpenSSL has no targetted way to disable this, thus OPENSSL_NO_SHA0 is
LibreSSL-only at prsent.
--- x11vnc/enc.h.orig Wed Sep 16 04:32:40 2015
+++ x11vnc/enc.h Wed Sep 16 04:35:00 2015
@ -8,7 +11,7 @@ LibreSSL 2.3 gets rid of SHA-0 (EVP_sha). There is no suitable OPENSSL_NO_xxx.
p++;
if (strstr(p, "md5+") == p) {
Digest = EVP_md5(); p += strlen("md5+");
+#if !(LIBRESSL_VERSION_NUMBER >= 0x20030000L)
+#ifndef OPENSSL_NO_SHA0
} else if (strstr(p, "sha+") == p) {
Digest = EVP_sha(); p += strlen("sha+");
+#endif