head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.2 date 2001.08.02.12.55.31; author itojun; state dead; branches; next 1.1; 1.1 date 2000.03.20.02.25.42; author itojun; state Exp; branches; next ; desc @@ 1.2 log @say goodbye to security/ssh6. per comments on packages@@netbsd. @ text @$NetBSD: patch-ba,v 1.1 2000/03/20 02:25:42 itojun Exp $ --- des.c.orig Wed May 12 07:19:25 1999 +++ des.c Fri Dec 24 21:50:04 1999 @@@@ -38,7 +38,7 @@@@ #include "includes.h" #include "getput.h" -#include "des.h" +#include "ssh-des.h" /* Table for key generation. This used to be in sk.h. */ /* Copyright (C) 1993 Eric Young - see README for more details */ @@@@ -400,7 +400,7 @@@@ /* This part is based on code that used to be in ecb_enc.c. */ /* Copyright (C) 1993 Eric Young - see README for more details */ -void des_encrypt(word32 l, word32 r, word32 *output, DESContext *ks, +void ssh_des_encrypt(word32 l, word32 r, word32 *output, DESContext *ks, int encrypt) { register word32 t,u; @@@@ -452,7 +452,7 @@@@ #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ (a)=(a)^(t)^(t>>(16-(n)))) -void des_set_key(unsigned char *key, DESContext *ks) +void ssh_des_set_key(unsigned char *key, DESContext *ks) { register word32 c, d, t, s, shifts; register int i; @@@@ -507,7 +507,7 @@@@ } } -void des_cbc_encrypt(DESContext *ks, unsigned char *iv, +void ssh_des_cbc_encrypt(DESContext *ks, unsigned char *iv, unsigned char *dest, const unsigned char *src, unsigned int len) { @@@@ -523,7 +523,7 @@@@ { iv0 ^= GET_32BIT_LSB_FIRST(src + i); iv1 ^= GET_32BIT_LSB_FIRST(src + i + 4); - des_encrypt(iv0, iv1, out, ks, 1); + ssh_des_encrypt(iv0, iv1, out, ks, 1); iv0 = out[0]; iv1 = out[1]; PUT_32BIT_LSB_FIRST(dest + i, iv0); @@@@ -533,7 +533,7 @@@@ PUT_32BIT_LSB_FIRST(iv + 4, iv1); } -void des_cbc_decrypt(DESContext *ks, unsigned char *iv, +void ssh_des_cbc_decrypt(DESContext *ks, unsigned char *iv, unsigned char *dest, const unsigned char *src, unsigned int len) { @@@@ -549,7 +549,7 @@@@ { d0 = GET_32BIT_LSB_FIRST(src + i); d1 = GET_32BIT_LSB_FIRST(src + i + 4); - des_encrypt(d0, d1, out, ks, 0); + ssh_des_encrypt(d0, d1, out, ks, 0); iv0 ^= out[0]; iv1 ^= out[1]; PUT_32BIT_LSB_FIRST(dest + i, iv0); @@@@ -561,38 +561,38 @@@@ PUT_32BIT_LSB_FIRST(iv + 4, iv1); } -void des_3cbc_encrypt(DESContext *ks1, unsigned char *iv1, +void ssh_des_3cbc_encrypt(DESContext *ks1, unsigned char *iv1, DESContext *ks2, unsigned char *iv2, DESContext *ks3, unsigned char *iv3, unsigned char *dest, const unsigned char *src, unsigned int len) { - des_cbc_encrypt(ks1, iv1, dest, src, len); - des_cbc_decrypt(ks2, iv2, dest, dest, len); - des_cbc_encrypt(ks3, iv3, dest, dest, len); + ssh_des_cbc_encrypt(ks1, iv1, dest, src, len); + ssh_des_cbc_decrypt(ks2, iv2, dest, dest, len); + ssh_des_cbc_encrypt(ks3, iv3, dest, dest, len); } -void des_3cbc_decrypt(DESContext *ks1, unsigned char *iv1, +void ssh_des_3cbc_decrypt(DESContext *ks1, unsigned char *iv1, DESContext *ks2, unsigned char *iv2, DESContext *ks3, unsigned char *iv3, unsigned char *dest, const unsigned char *src, unsigned int len) { - des_cbc_decrypt(ks3, iv3, dest, src, len); - des_cbc_encrypt(ks2, iv2, dest, dest, len); - des_cbc_decrypt(ks1, iv1, dest, dest, len); + ssh_des_cbc_decrypt(ks3, iv3, dest, src, len); + ssh_des_cbc_encrypt(ks2, iv2, dest, dest, len); + ssh_des_cbc_decrypt(ks1, iv1, dest, dest, len); } -#ifdef DES_TEST +#ifdef SSH_DES_TEST -void des_encrypt_buf(DESContext *ks, unsigned char *out, +void ssh_des_encrypt_buf(DESContext *ks, unsigned char *out, const unsigned char *in, int encrypt) { word32 in0, in1, output[0]; in0 = GET_32BIT_LSB_FIRST(in); in1 = GET_32BIT_LSB_FIRST(in + 4); - des_encrypt(in0, in1, output, ks, encrypt); + ssh_des_encrypt(in0, in1, output, ks, encrypt); PUT_32BIT_LSB_FIRST(out, output[0]); PUT_32BIT_LSB_FIRST(out + 4, output[1]); } @@@@ -634,15 +634,15 @@@@ } result[i] = value; } - des_set_key(key, &ks); - des_encrypt_buf(&ks, output, data, 1); + ssh_des_set_key(key, &ks); + ssh_des_encrypt_buf(&ks, output, data, 1); if (memcmp(output, result, 8) != 0) fprintf(stderr, "Encrypt failed: %s", line); - des_encrypt_buf(&ks, output, result, 0); + ssh_des_encrypt_buf(&ks, output, result, 0); if (memcmp(output, data, 8) != 0) fprintf(stderr, "Decrypt failed: %s", line); } exit(0); } -#endif /* DES_TEST */ +#endif /* SSH_DES_TEST */ @ 1.1 log @split security/ssh and security/ssh6. security/ssh6: IPv4/v6 ready, socks unavailable, kerberos available (not tested) security/ssh: IPv4 onlyready, socks available, kerberos available (not tested) should be integrated into one whenever socks support becomes aware of getaddrinfo/getnameinfo. two directories with tons of patches/patch-* is a maintenance headache. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.1 1999/12/25 05:28:36 kim Exp $ @