Browse Source

dropbear: Updated (0.52 -> 0.53.1)

stable/0.2
Alejandro Mery 14 years ago
parent
commit
c6e22cf1d3
  1. 6
      security/dropbear/dropbear.desc
  2. 19
      security/dropbear/legacy_sus.patch

6
security/dropbear/dropbear.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../dropbear/dropbear.desc [COPY] Filename: package/.../dropbear/dropbear.desc
[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] [COPY]
[COPY] More information can be found in the files COPYING and README. [COPY] More information can be found in the files COPYING and README.
@ -29,8 +29,8 @@
[L] MIT [L] MIT
[S] Stable [S] Stable
[V] 0.52 [V] 0.53.1
[P] X -?---5---9 191.100 [P] X -?---5---9 191.100
[D] 1727358443 dropbear-0.52.tar.gz http://matt.ucc.asn.au/dropbear/releases/ [D] 240943820 dropbear-0.53.1.tar.gz http://matt.ucc.asn.au/dropbear/releases/

19
security/dropbear/legacy_sus.patch

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../dropbear/legacy_sus.patch # Filename: package/.../dropbear/legacy_sus.patch
# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2010 - 2011 The OpenSDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
# #
@ -17,15 +17,20 @@
usleep() was deprecated by SUSv3 and newer LIBCs are starting to enforce that usleep() was deprecated by SUSv3 and newer LIBCs are starting to enforce that
deprecation. deprecation.
--- ./svr-auth.c.orig 2010-09-20 16:12:52.000000000 -0400 --- ./svr-auth.c.orig 2011-04-29 16:58:36.000000000 +0200
+++ ./svr-auth.c 2010-09-20 16:15:08.000000000 -0400 +++ ./svr-auth.c 2011-04-29 17:01:48.000000000 +0200
@@ -337,7 +337,8 @@ @@ -338,11 +338,12 @@
encrypt_packet(); encrypt_packet();
if (incrfail) { if (incrfail) {
- usleep(300000); /* XXX improve this */ + struct timespec ts = {0, 250000000L};
+ const struct timespec ts = { 0, 300000000L }; unsigned int delay;
+ nanosleep(&ts, NULL); /* XXX improve this */ genrandom((unsigned char*)&delay, sizeof(delay));
/* We delay for 300ms +- 50ms, 0.1ms granularity */
- delay = 250000 + (delay % 1000)*100;
- usleep(delay);
+ ts.tv_nsec += (delay % 1000)*100000L;
+ nanosleep(&ts, NULL);
ses.authstate.failcount++; ses.authstate.failcount++;
} }

Loading…
Cancel
Save