diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2002-06-29 21:39:04 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-06-29 21:39:04 +0000 |
| commit | 9d22564582c70a5389dd16d7167fdc1f7b86bee1 (patch) | |
| tree | a23c1f59ac07c9dc86e6f5b072c9eb333ee7df27 /security/ssh | |
| parent | Update to version 1.2.31. (diff) | |
Update to version 1.2.32.
Notes
Notes:
svn path=/head/; revision=62196
Diffstat (limited to 'security/ssh')
| -rw-r--r-- | security/ssh/Makefile | 2 | ||||
| -rw-r--r-- | security/ssh/distinfo | 2 | ||||
| -rw-r--r-- | security/ssh/files/patch-ay | 20 | ||||
| -rw-r--r-- | security/ssh/files/patch-az | 12 |
4 files changed, 2 insertions, 34 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 5639c696fdac..d15ab006d30a 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -9,7 +9,7 @@ # PORTNAME= ssh -PORTVERSION= 1.2.31 +PORTVERSION= 1.2.32 PORTREVISION= 0 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/security/ssh/old/ \ diff --git a/security/ssh/distinfo b/security/ssh/distinfo index 075099ea17a9..37a4bc1ddb41 100644 --- a/security/ssh/distinfo +++ b/security/ssh/distinfo @@ -1 +1 @@ -MD5 (ssh-1.2.31.tar.gz) = 2147f591fc16632c8a89e61d2e94ec55 +MD5 (ssh-1.2.32.tar.gz) = dad51d7af41259d85623bcf33fd02137 diff --git a/security/ssh/files/patch-ay b/security/ssh/files/patch-ay deleted file mode 100644 index 71daac2ca4a9..000000000000 --- a/security/ssh/files/patch-ay +++ /dev/null @@ -1,20 +0,0 @@ ---- rsaglue.c 1999/12/10 23:27:25 1.8 -+++ rsaglue.c 2001/02/03 09:42:05 -@@ -264,7 +268,15 @@ - mpz_clear(&aux); - - if (value[0] != 0 || value[1] != 2) -- fatal("Bad result from rsa_private_decrypt"); -+ { -+ static time_t last_kill_time = 0; -+ if (time(NULL) - last_kill_time > 60 && getppid() != 1) -+ { -+ last_kill_time = time(NULL); -+ kill(getppid(), SIGALRM); -+ } -+ fatal("Bad result from rsa_private_decrypt"); -+ } - - for (i = 2; i < len && value[i]; i++) - ; - diff --git a/security/ssh/files/patch-az b/security/ssh/files/patch-az deleted file mode 100644 index e09b6edda900..000000000000 --- a/security/ssh/files/patch-az +++ /dev/null @@ -1,12 +0,0 @@ ---- deattack.c-old Wed Feb 7 19:45:16 2001 -+++ deattack.c Wed Feb 7 19:54:11 2001 -@@ -79,7 +79,7 @@ - detect_attack(unsigned char *buf, word32 len, unsigned char *IV) - { - static word16 *h = (word16 *) NULL; -- static word16 n = HASH_MINSIZE / HASH_ENTRYSIZE; -+ static word32 n = HASH_MINSIZE / HASH_ENTRYSIZE; - register word32 i, j; - word32 l; - register unsigned char *c; - |