head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.46
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.44
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.42
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.40
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.38
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.36
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.34
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.32
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.30
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.28
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.26
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.24
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.22
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.20
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.18
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.16
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.14
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.12
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.10
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.8
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.6
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.4
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.2
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.1.0.8
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.6
	pkgsrc-2004Q2-base:1.1
	pkgsrc-2004Q1:1.1.0.4
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.2
	pkgsrc-2003Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2004.12.15.19.34.40;	author jlam;	state dead;
branches;
next	1.1;

1.1
date	2003.09.21.08.35.53;	author jmc;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Convert to set USE_OLD_DES_API=yes, and remove unnecessary patches to
teach fressh how to use either DES API.  Bump PKGREVISION since on
NetBSD>=2.0, fressh gains a library dependency on -ldes.
@
text
@$NetBSD: patch-ac,v 1.1 2003/09/21 08:35:53 jmc Exp $

--- crypto/ssh_3des.h.orig	2003-09-21 03:04:38.000000000 +0000
+++ crypto/ssh_3des.h	2003-09-21 03:05:29.000000000 +0000
@@@@ -16,6 +16,7 @@@@
 #ifndef _SSH_3DES_H
 #define _SSH_3DES_H
 
+#include "openssl/opensslv.h"
 #include "openssl/des.h"
 #include "openssl/hmac.h"
 
@@@@ -24,13 +25,23 @@@@
 struct ssh_cipher;
 
 typedef struct {
+#if OPENSSL_VERSION_NUMBER >= 0x0090702fL
+	DES_key_schedule des_ks[3];
+	DES_cblock	 des_ivec[6];	/* Two directions, same key! */
+#else
 	des_key_schedule des_ks[3];
 	des_cblock	 des_ivec[6];	/* Two directions, same key! */
+#endif
 } ssh_3des_t;
 
 typedef struct {
+#if OPENSSL_VERSION_NUMBER >= 0x0090702fL
+	DES_key_schedule des_ks[6];
+	DES_cblock	 des_ivec[2];
+#else
 	des_key_schedule des_ks[6];
 	des_cblock	 des_ivec[2];
+#endif
 	u_int8_t	 mac_key[2][16];
 } ssh_des3_t;
 
@


1.1
log
@Check openssl version and use new DES api if >= 0.9.7. Allows build to
work on -current again. Bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
@