Update of /cvsroot/leaf/src/bering-uclibc/apps/dropbear
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18173
Modified Files:
buildtool.cfg buildtool.mk options.h
Added Files:
dropbear-0.47.tar.bz2
Removed Files:
dropbear-0.46.tar.gz
Log Message:
update to version 0.47
Index: options.h
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/dropbear/options.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** options.h 13 Jul 2005 19:46:36 -0000 1.9
--- options.h 12 Dec 2005 20:31:35 -0000 1.10
***************
*** 63,85 ****
/* Encryption - at least one required.
! * RFC Draft requires 3DES, and recommends Blowfish, AES128 & Twofish128 */
/*#define DROPBEAR_AES128_CBC*/
/*#define DROPBEAR_BLOWFISH_CBC*/
/*#define DROPBEAR_TWOFISH128_CBC*/
- #define DROPBEAR_3DES_CBC
! /* Integrity - at least one required.
! * RFC Draft requires sha1-hmac, and recommends md5-hmac.
*
! * Note: there's no point disabling sha1 to save space, since it's used in the
* for the random number generator and public-key cryptography anyway.
* Disabling it here will just stop it from being used as the integrity
portion
* of the ssh protocol.
*
! * These are also used for key fingerprints in logs (when pubkey auth is
used),
! * MD5 fingerprints are printed if available, however SHA1 fingerprints will
be
! * generated otherwise. This isn't exactly optimal, although SHA1 fingerprints
! * are not too hard to create from pubkeys if required. */
#define DROPBEAR_SHA1_HMAC
/*#define DROPBEAR_MD5_HMAC*/
--- 63,90 ----
/* Encryption - at least one required.
! * RFC Draft requires 3DES and recommends AES128 for interoperability.
! * Including multiple keysize variants the same cipher
! * (eg AES256 as well as AES128) will result in a minimal size increase.*/
/*#define DROPBEAR_AES128_CBC*/
+ #define DROPBEAR_3DES_CBC
+ /*#define DROPBEAR_AES256_CBC*/
/*#define DROPBEAR_BLOWFISH_CBC*/
+ /*#define DROPBEAR_TWOFISH256_CBC*/
/*#define DROPBEAR_TWOFISH128_CBC*/
! /* Message Integrity - at least one required.
! * RFC Draft requires sha1 and recommends sha1-96.
! * sha1-96 may be of use for slow links, as it has a smaller overhead.
*
! * Note: there's no point disabling sha1 to save space, since it's used
* for the random number generator and public-key cryptography anyway.
* Disabling it here will just stop it from being used as the integrity
portion
* of the ssh protocol.
*
! * These hashes are also used for public key fingerprints in logs.
! * If you disable MD5, Dropbear will fall back to SHA1 fingerprints,
! * which are not the standard form. */
#define DROPBEAR_SHA1_HMAC
+ /*#define DROPBEAR_SHA1_96_HMAC*/
/*#define DROPBEAR_MD5_HMAC*/
***************
*** 129,132 ****
--- 134,138 ----
#define ENABLE_CLI_PASSWORD_AUTH
#define ENABLE_CLI_PUBKEY_AUTH
+ #define ENABLE_CLI_INTERACT_AUTH
/* Define this (as well as ENABLE_CLI_PASSWORD_AUTH) to allow the use of
***************
*** 195,199 ****
#ifndef DROPBEAR_VERSION
! #define DROPBEAR_VERSION "0.46"
#endif
--- 201,205 ----
#ifndef DROPBEAR_VERSION
! #define DROPBEAR_VERSION "0.47"
#endif
***************
*** 274,278 ****
! #define MAX_KEY_LEN 24 /* 3DES requires a 24 byte key */
#define MAX_IV_LEN 20 /* must be same as max blocksize,
and >= SHA1_HASH_SIZE */
--- 280,284 ----
! #define MAX_KEY_LEN 32 /* 256 bits for aes256 etc */
#define MAX_IV_LEN 20 /* must be same as max blocksize,
and >= SHA1_HASH_SIZE */
***************
*** 301,308 ****
is the max length
for a password etc */
! /* For a 4096 bit DSS key, empirically determined to be 1590 bytes */
! #define MAX_PUBKEY_SIZE 1600
! /* For a 4096 bit DSS key, empirically determined to be 1590 bytes */
! #define MAX_PRIVKEY_SIZE 1600
#define DROPBEAR_MAX_SOCKS 2 /* IPv4, IPv6 are all we'll get for now. Revisit
--- 307,318 ----
is the max length
for a password etc */
! /* For a 4096 bit DSS key, empirically determined */
! #define MAX_PUBKEY_SIZE 1700
! /* For a 4096 bit DSS key, empirically determined */
! #define MAX_PRIVKEY_SIZE 1700
!
! /* The maximum size of the bignum portion of the kexhash buffer */
! /* Sect. 8 of the transport draft, K_S + e + f + K */
! #define KEXHASHBUF_MAX_INTS (1700 + 130 + 130 + 130)
#define DROPBEAR_MAX_SOCKS 2 /* IPv4, IPv6 are all we'll get for now. Revisit
***************
*** 311,314 ****
--- 321,336 ----
#define DROPBEAR_MAX_CLI_PASS 1024
+ #define DROPBEAR_MAX_CLI_INTERACT_PROMPTS 80 /* The number of prompts we'll
+
accept for keyb-interactive
+
auth */
+
+ #if defined(DROPBEAR_AES256_CBC) || defined(DROPBEAR_AES128_CBC)
+ #define DROPBEAR_AES_CBC
+ #endif
+
+ #if defined(DROPBEAR_TWOFISH256_CBC) || defined(DROPBEAR_TWOFISH128_CBC)
+ #define DROPBEAR_TWOFISH_CBC
+ #endif
+
#ifndef ENABLE_X11FWD
#define DISABLE_X11FWD
--- dropbear-0.46.tar.gz DELETED ---
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/dropbear/buildtool.cfg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildtool.cfg 13 Jul 2005 19:46:34 -0000 1.6
--- buildtool.cfg 12 Dec 2005 20:31:34 -0000 1.7
***************
*** 5,9 ****
</File>
! <File dropbear-0.46.tar.gz>
Server = cvs-sourceforge
Revision = HEAD
--- 5,9 ----
</File>
! <File dropbear-0.47.tar.bz2>
Server = cvs-sourceforge
Revision = HEAD
***************
*** 39,43 ****
<Package>
<dropbear>
! Version = 0.46
Revision = 1
--- 39,43 ----
<Package>
<dropbear>
! Version = 0.47
Revision = 1
***************
*** 117,121 ****
</dropbear>
<dbclient>
! Version = 0.46
Revision = 1
--- 117,121 ----
</dropbear>
<dbclient>
! Version = 0.47
Revision = 1
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/dropbear/buildtool.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildtool.mk 13 Jul 2005 19:46:34 -0000 1.6
--- buildtool.mk 12 Dec 2005 20:31:34 -0000 1.7
***************
*** 2,10 ****
include $(MASTERMAKEFILE)
! DROPBEAR_DIR:=dropbear-0.46
DROPBEAR_TARGET_DIR:=$(BT_BUILD_DIR)/dropbear
$(DROPBEAR_DIR)/.source:
! zcat $(DROPBEAR_SOURCE) | tar -xvf -
touch $(DROPBEAR_DIR)/.source
--- 2,10 ----
include $(MASTERMAKEFILE)
! DROPBEAR_DIR:=dropbear-0.47
DROPBEAR_TARGET_DIR:=$(BT_BUILD_DIR)/dropbear
$(DROPBEAR_DIR)/.source:
! bzcat $(DROPBEAR_SOURCE) | tar -xvf -
touch $(DROPBEAR_DIR)/.source
--- NEW FILE: dropbear-0.47.tar.bz2 ---
(This appears to be a binary file; contents omitted.)
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
