sync w/ new openssl stuff; ok fgs, no resp from maintainer

This commit is contained in:
pvalchev 2002-06-07 03:57:05 +00:00
parent 996926ccdf
commit ecdad80b6a
3 changed files with 43 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2001/11/10 15:00:49 espie Exp $
# $OpenBSD: Makefile,v 1.24 2002/06/07 03:57:05 pvalchev Exp $
COMMENT= "sniffing tools for penetration testing"
@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
FLAVORS= no_x11
FLAVOR?=

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-configure_in,v 1.1 2002/06/07 03:57:05 pvalchev Exp $
--- configure.in.orig Tue May 28 16:18:35 2002
+++ configure.in Tue May 28 16:18:44 2002
@@ -307,7 +307,7 @@ AC_ARG_WITH(openssl,
owd=`pwd`
if cd $withval; then withval=`pwd`; cd $owd; fi
SSLINC="-I$withval/include"
- SSLLIB="-L$withval/lib -lssl -lcrypto"
+ SSLLIB="-L$withval/lib -lssl -lcrypto -ldes"
else
AC_ERROR(ssl.h or libssl.a not found in $withval)
fi
@@ -316,12 +316,12 @@ AC_ARG_WITH(openssl,
esac ],
[ if test -f ${prefix}/include/openssl/ssl.h; then
SSLINC="-I${prefix}/include"
- SSLLIB="-L${prefix}/lib -lssl -lcrypto"
+ SSLLIB="-L${prefix}/lib -lssl -lcrypto -ldes"
elif test -f ${prefix}/ssl/include/openssl/ssl.h; then
SSLINC="-I${prefix}/ssl/include"
- SSLLIB="-L${prefix}/ssl/lib -lssl -lcrypto"
+ SSLLIB="-L${prefix}/ssl/lib -lssl -lcrypto -ldes"
elif test -f /usr/include/openssl/ssl.h; then
- SSLLIB="-lssl -lcrypto"
+ SSLLIB="-lssl -lcrypto -ldes"
else
AC_MSG_RESULT(no)
AC_ERROR(OpenSSL not found)

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-sshcrypto_c,v 1.1 2002/06/07 03:57:05 pvalchev Exp $
--- sshcrypto.c.orig Tue Nov 28 14:23:28 2000
+++ sshcrypto.c Tue May 28 16:25:30 2002
@@ -15,7 +15,9 @@
#include <sys/types.h>
#include <openssl/ssl.h>
+#include <des.h>
#include <err.h>
+#include <ssl/blowfish.h>
#include <stdio.h>
#include <stdlib.h>