summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authoradrianp <adrianp>2006-08-05 13:30:26 +0000
committeradrianp <adrianp>2006-08-05 13:30:26 +0000
commit8e1b9e46db975bde28e8b8f9ffc1395204e3d907 (patch)
tree71b66d9cdf2be4dacb1f78a0fd674a7f778b0fb0 /security
parent9f6ad2148014c3b11475b4c9d45a7ee6d7fa4ff2 (diff)
downloadpkgsrc-8e1b9e46db975bde28e8b8f9ffc1395204e3d907.tar.gz
Fix for SA21310/CVE-2006-3123
Patch via. Debian
Diffstat (limited to 'security')
-rw-r--r--security/cfs/distinfo4
-rw-r--r--security/cfs/patches/patch-ah22
2 files changed, 22 insertions, 4 deletions
diff --git a/security/cfs/distinfo b/security/cfs/distinfo
index df1ac1e2b54..8df2d54ec6d 100644
--- a/security/cfs/distinfo
+++ b/security/cfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/09/08 22:37:54 abs Exp $
+$NetBSD: distinfo,v 1.11 2006/08/05 13:30:26 adrianp Exp $
SHA1 (cfs-1.4.1.tar.gz) = be3f73b233149477b739456498c71b120d5f2fb5
RMD160 (cfs-1.4.1.tar.gz) = 0ced92fe9773c6ce6b6706e26de9e17e710e7e46
@@ -10,4 +10,4 @@ SHA1 (patch-ad) = 2ed5967d59d8f91948b2dd9ed4b18c5073d63615
SHA1 (patch-ae) = 68b440cda27353d1035bae3002a83d8131087a24
SHA1 (patch-af) = 19bbedcf0c37356dab747087c64617608ff91838
SHA1 (patch-ag) = 3c0236d65fbf01d68c590fcecc264ac269e66a7a
-SHA1 (patch-ah) = 6426888cf462fcd4c0245cb32ae78b7520aaf2d5
+SHA1 (patch-ah) = 8e1e92edf2e16e0c6a9c31e6c102f76129305b60
diff --git a/security/cfs/patches/patch-ah b/security/cfs/patches/patch-ah
index d43bd232816..34ed87cd854 100644
--- a/security/cfs/patches/patch-ah
+++ b/security/cfs/patches/patch-ah
@@ -1,7 +1,25 @@
-$NetBSD: patch-ah,v 1.1 2005/03/21 18:08:31 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2006/08/05 13:30:26 adrianp Exp $
---- cfs_fh.c.orig 2004-11-30 11:19:25.000000000 -0500
+--- cfs_fh.c.orig 2006-08-05 14:21:22.000000000 +0100
+++ cfs_fh.c
+@@ -289,7 +289,7 @@ doencrypt(k,s,l,salt,vect)
+ cfskey *k;
+ char *s;
+ int l;
+- int salt;
++ u_long salt;
+ char *vect;
+ {
+ int i,j,smsize;
+@@ -311,7 +311,7 @@ dodecrypt(k,s,l,salt,vect)
+ cfskey *k;
+ char *s;
+ int l;
+- int salt;
++ u_long salt;
+ char *vect;
+ {
+ int i,j,smsize;
@@ -547,7 +547,9 @@ fhtofd(f,mode)
openfd=NULL;
}