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

Fix x11vnc: no more SHA-0 in LibreSSL.

Browse Source
This commit is contained in:
sthen 2015-09-16 10:36:08 +00:00
parent efba283964
commit 2e762a9ae3
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
x11/x11vnc/patches/patch-x11vnc_enc_h Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-x11vnc_enc_h,v 1.1 2015/09/16 10:36:08 sthen Exp $
LibreSSL 2.3 gets rid of SHA-0 (EVP_sha). There is no suitable OPENSSL_NO_xxx.
--- x11vnc/enc.h.orig Wed Sep 16 04:32:40 2015
+++ x11vnc/enc.h Wed Sep 16 04:35:00 2015
@@ -454,8 +454,10 @@ extern void enc_do(char *ciph, char *keyfile, char *lp
p++;
if (strstr(p, "md5+") == p) {
Digest = EVP_md5(); p += strlen("md5+");
+#if !(LIBRESSL_VERSION_NUMBER >= 0x20030000L)
} else if (strstr(p, "sha+") == p) {
Digest = EVP_sha(); p += strlen("sha+");
+#endif
} else if (strstr(p, "sha1+") == p) {
Digest = EVP_sha1(); p += strlen("sha1+");
} else if (strstr(p, "ripe+") == p) {
@@ -1407,7 +1409,7 @@ static void securevnc_setup(int conn1, int conn2) {
fprintf(stderr, "securevnc_setup: RAND_pseudo_bytes() rc=%d\n", rc);
if (getenv("RANDSTR")) {
char *s = getenv("RANDSTR");
- fprintf(stderr, "securevnc_setup: seeding with RANDSTR len=%d\n", strlen(s));
+ fprintf(stderr, "securevnc_setup: seeding with RANDSTR len=%zd\n", strlen(s));
RAND_add(s, strlen(s), strlen(s));
}
}