--x+6KMIRAuhnl3hBn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

some packages which uses openssl doesn't compile after openssl was updated
in NetBSD-current.
I would like to commit the following patches, but don't have a 2.0 or 1.6
system for checking if they break something.

- ssldump
Patch is from the bugtracking system at sourceforge:
http://sourceforge.net/tracker/index.php?func=detail&aid=1284378&group_id=68993&atid=523055

- dsniff
Modified existing patch based on
http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg31075.html

Bernd


--x+6KMIRAuhnl3hBn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="openssl.patches"

Index: security/dsniff/Makefile.common
===================================================================
RCS file: /home/source/NetBSD-cvs/main/pkgsrc/security/dsniff/Makefile.common,v
retrieving revision 1.2
diff -u -b -b -u -r1.2 Makefile.common
--- security/dsniff/Makefile.common	11 Apr 2005 21:47:11 -0000	1.2
+++ security/dsniff/Makefile.common	5 Dec 2005 21:49:51 -0000
@@ -2,6 +2,7 @@
 
 DISTNAME=	dsniff-${VERS}
 VERS=		2.3
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES+=	http://monkey.org/~dugsong/dsniff/
 
Index: security/dsniff/distinfo
===================================================================
RCS file: /home/source/NetBSD-cvs/main/pkgsrc/security/dsniff/distinfo,v
retrieving revision 1.4
diff -u -b -b -u -r1.4 distinfo
--- security/dsniff/distinfo	24 Feb 2005 13:10:05 -0000	1.4
+++ security/dsniff/distinfo	5 Dec 2005 21:49:13 -0000
@@ -4,4 +4,4 @@
 RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
 Size (dsniff-2.3.tar.gz) = 126797 bytes
 SHA1 (patch-aa) = b50347c772c13abd6b62a80315c7bfecc139ba60
-SHA1 (patch-ab) = 88c8e182a95b03120446f1453806e5354c074b83
+SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44
Index: security/dsniff/patches/patch-ab
===================================================================
RCS file: /home/source/NetBSD-cvs/main/pkgsrc/security/dsniff/patches/patch-ab,v
retrieving revision 1.1
diff -u -b -b -u -r1.1 patch-ab
--- security/dsniff/patches/patch-ab	29 Oct 2003 18:10:10 -0000	1.1
+++ security/dsniff/patches/patch-ab	5 Dec 2005 21:48:52 -0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2003/10/29 18:10:10 cube Exp $
+$NetBSD$
 
 --- sshcrypto.c.orig	2000-11-28 22:23:28.000000000 +0100
 +++ sshcrypto.c
-@@ -21,6 +21,15 @@
+@@ -14,6 +14,8 @@
+ 
+ #include <sys/types.h>
+ #include <openssl/ssl.h>
++#include <openssl/blowfish.h>
++#include <openssl/des.h>
+ 
+ #include <err.h>
+ #include <stdio.h>
+@@ -21,6 +23,15 @@
  
  #include "sshcrypto.h"
  
Index: security/ssldump/Makefile
===================================================================
RCS file: /home/source/NetBSD-cvs/main/pkgsrc/security/ssldump/Makefile,v
retrieving revision 1.14
diff -u -b -b -u -r1.14 Makefile
--- security/ssldump/Makefile	22 May 2005 20:08:31 -0000	1.14
+++ security/ssldump/Makefile	5 Dec 2005 21:35:34 -0000
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	ssldump-0.9b3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://www.rtfm.com/ssldump/
 
Index: security/ssldump/distinfo
===================================================================
RCS file: /home/source/NetBSD-cvs/main/pkgsrc/security/ssldump/distinfo,v
retrieving revision 1.4
diff -u -b -b -u -r1.4 distinfo
--- security/ssldump/distinfo	24 Feb 2005 13:10:13 -0000	1.4
+++ security/ssldump/distinfo	5 Dec 2005 21:38:16 -0000
@@ -3,3 +3,4 @@
 SHA1 (ssldump-0.9b3.tar.gz) = a633a9a811a138eac5ed440d583473b644135ef5
 RMD160 (ssldump-0.9b3.tar.gz) = 941cf8f2ef8459ec4f9ce65772e134505d46566f
 Size (ssldump-0.9b3.tar.gz) = 137435 bytes
+SHA1 (patch-aa) = 8ab6a65c0e338e99249a0c90b87340252494020a

--x+6KMIRAuhnl3hBn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=ssldump_patch-aa

$NetBSD$

--- ssl/ssldecode.c-orig	2002-08-17 03:33:17.000000000 +0200
+++ ssl/ssldecode.c
@@ -51,6 +51,7 @@
 #include <openssl/ssl.h>
 #include <openssl/hmac.h>
 #include <openssl/evp.h>
+#include <openssl/md5.h>
 #include <openssl/x509v3.h>
 #endif
 #include "ssldecode.h"
@@ -131,7 +132,8 @@ int ssl_decode_ctx_create(dp,keyfile,pas
     ssl_decode_ctx *d=0;
     int r,_status;
     
-    SSLeay_add_all_algorithms();
+    SSL_library_init();
+    OpenSSL_add_all_algorithms();
     if(!(d=(ssl_decode_ctx *)malloc(sizeof(ssl_decode_ctx))))
       ABORT(R_NO_MEMORY);
     if(!(d->ssl_ctx=SSL_CTX_new(SSLv23_server_method())))

--x+6KMIRAuhnl3hBn--