diff options
author | kim <kim> | 1999-12-25 05:28:33 +0000 |
---|---|---|
committer | kim <kim> | 1999-12-25 05:28:33 +0000 |
commit | 25943791b35ba19000b9cddaacd7abf7707500f5 (patch) | |
tree | 79283d131b3e54b6543d4c57e90af12d329d5eee /security/ssh/patches/patch-ax | |
parent | 45d5ff61ee162a4a81c4ac5e99c354d4b8a3491f (diff) | |
download | pkgsrc-25943791b35ba19000b9cddaacd7abf7707500f5.tar.gz |
Folded in IPv6 and Kerberos IV patches, so that both can be
compiled. This also fixes problems with Kerberos IV and V
support clashing (you still have to choose one or the other
at compile time, though).
Compiles and runs on 1.4O -- needs testing on 1.4.2, and
also some closer looking at certain patches (e.g. patch-au
has a "#if 0" that could maybe be something else).
Diffstat (limited to 'security/ssh/patches/patch-ax')
-rw-r--r-- | security/ssh/patches/patch-ax | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/security/ssh/patches/patch-ax b/security/ssh/patches/patch-ax new file mode 100644 index 00000000000..bafc21a6f8d --- /dev/null +++ b/security/ssh/patches/patch-ax @@ -0,0 +1,60 @@ +$NetBSD: patch-ax,v 1.1 1999/12/25 05:28:36 kim Exp $ + +--- cipher.c.orig Wed May 12 07:19:24 1999 ++++ cipher.c Fri Dec 24 21:50:04 1999 +@@ -213,7 +213,7 @@ + used. */ + if (keylen < 8) + error("Key length %d is insufficient for DES.", keylen); +- des_set_key(padded, &context->u.des.key); ++ ssh_des_set_key(padded, &context->u.des.key); + memset(context->u.des.iv, 0, sizeof(context->u.des.iv)); + break; + #endif /* WITH_DES */ +@@ -224,12 +224,12 @@ + used (first and last keys are the same). */ + if (keylen < 16) + error("Key length %d is insufficient for 3DES.", keylen); +- des_set_key(padded, &context->u.des3.key1); +- des_set_key(padded + 8, &context->u.des3.key2); ++ ssh_des_set_key(padded, &context->u.des3.key1); ++ ssh_des_set_key(padded + 8, &context->u.des3.key2); + if (keylen <= 16) +- des_set_key(padded, &context->u.des3.key3); ++ ssh_des_set_key(padded, &context->u.des3.key3); + else +- des_set_key(padded + 16, &context->u.des3.key3); ++ ssh_des_set_key(padded + 16, &context->u.des3.key3); + memset(context->u.des3.iv1, 0, sizeof(context->u.des3.iv1)); + memset(context->u.des3.iv2, 0, sizeof(context->u.des3.iv2)); + memset(context->u.des3.iv3, 0, sizeof(context->u.des3.iv3)); +@@ -274,12 +274,12 @@ + + #ifdef WITH_DES + case SSH_CIPHER_DES: +- des_cbc_encrypt(&context->u.des.key, context->u.des.iv, dest, src, len); ++ ssh_des_cbc_encrypt(&context->u.des.key, context->u.des.iv, dest, src, len); + break; + #endif /* WITH_DES */ + + case SSH_CIPHER_3DES: +- des_3cbc_encrypt(&context->u.des3.key1, context->u.des3.iv1, ++ ssh_des_3cbc_encrypt(&context->u.des3.key1, context->u.des3.iv1, + &context->u.des3.key2, context->u.des3.iv2, + &context->u.des3.key3, context->u.des3.iv3, + dest, src, len); +@@ -322,12 +322,12 @@ + + #ifdef WITH_DES + case SSH_CIPHER_DES: +- des_cbc_decrypt(&context->u.des.key, context->u.des.iv, dest, src, len); ++ ssh_des_cbc_decrypt(&context->u.des.key, context->u.des.iv, dest, src, len); + break; + #endif /* WITH_DES */ + + case SSH_CIPHER_3DES: +- des_3cbc_decrypt(&context->u.des3.key1, context->u.des3.iv1, ++ ssh_des_3cbc_decrypt(&context->u.des3.key1, context->u.des3.iv1, + &context->u.des3.key2, context->u.des3.iv2, + &context->u.des3.key3, context->u.des3.iv3, + dest, src, len); |