Commit f3c8bb2b authored by Matt Johnston's avatar Matt Johnston
Browse files

merge of 00b67a11e33c3ed390556805ed6d1078528bee70

     and 42c7bdf484b16e279a0f68604a4346d8fa5ed70c

--HG--
extra : convert_revision : edf8bd9174de26de093d842aa4bd9cb43c2e257b
parent ee23b01f
0.44test1 - Sun Aug 16 2004 17:43:54 +0800 0.44test2 - Tues Aug 17 2004 17:43:54 +0800
- Fix up dropbearmulti targets in the Makefile - symlinks are now created
- Compile fake-rfc2553 even with dropbearconvert/dropbearkey - this
allows them to work on platforms without a native getaddrinfo()
- Create ~/.ssh/known_hosts properly if it doesn't exist
- Fix basename() function prototype
- Backport some local changes (more #ifdefs for termcodes.c, a fix for missing
defines on AIX).
- Let dbclient be run as "ssh"
- Initialise mp_ints by default
0.44test1 - Sun Aug 16 2005 17:43:54 +0800
- TESTING RELEASE - this is the first public release of the client codebase, - TESTING RELEASE - this is the first public release of the client codebase,
so there are sure to be bugs to be found. In addition, if you're just using so there are sure to be bugs to be found. In addition, if you're just using
......
...@@ -17,7 +17,7 @@ [email protected] ...@@ -17,7 +17,7 @@ [email protected]
In the absence of detailed documentation, some notes follow: In the absence of detailed documentation, some notes follow:
============================================================================ ============================================================================
Public key auth: Server public key auth:
You can use ~/.ssh/authorized_keys in the same way as with OpenSSH, just put You can use ~/.ssh/authorized_keys in the same way as with OpenSSH, just put
the key entries in that file. They should be of the form: the key entries in that file. They should be of the form:
...@@ -32,6 +32,21 @@ OpenSSH sshd manpage, and will not allow a login for these keys. ...@@ -32,6 +32,21 @@ OpenSSH sshd manpage, and will not allow a login for these keys.
============================================================================ ============================================================================
Client public key auth:
Dropbear can do public key auth as a client, but you will have to convert
OpenSSH style keys to Dropbear format, or use dropbearkey to create them.
If you have an OpenSSH-style private key ~/.ssh/id_rsa, you need to do:
dropbearconvert openssh dropbear ~/.ssh/id_rsa ~/.ssh/id_rsa.db
dbclient -i ~/.ssh/id_rsa.db <hostname>
Currently encrypted keys aren't supported, neither is agent forwarding. At some
stage both hopefully will be.
============================================================================
If you want to get the public-key portion of a Dropbear private key, look at If you want to get the public-key portion of a Dropbear private key, look at
dropbearkey's '-y' option. dropbearkey's '-y' option.
......
...@@ -8,6 +8,8 @@ Things which might need doing: ...@@ -8,6 +8,8 @@ Things which might need doing:
- fix agent fwd problems - fix agent fwd problems
- handle /etc/environment in AIX
- improve channel window adjustment algorithm (circular buffering) - improve channel window adjustment algorithm (circular buffering)
- check that there aren't timing issues with valid/invalid user authentication - check that there aren't timing issues with valid/invalid user authentication
......
dropbear (0.44test2-1) unstable; urgency=low
* New upstream beta, various minor fixes.
-- Matt Johnston <[email protected]> Tues, 17 August 2004 19:00:00 +0800
dropbear (0.44test1-1) unstable; urgency=low dropbear (0.44test1-1) unstable; urgency=low
* Upstream beta 0.44test1 * Upstream beta 0.44test1
......
/* /* Dropbear SSH
* Dropbear - a SSH2 server
*
* Copyright (c) 2002,2003 Matt Johnston * Copyright (c) 2002,2003 Matt Johnston
* All rights reserved. * All rights reserved. See LICENSE for the license. */
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _OPTIONS_H_ #ifndef _OPTIONS_H_
#define _OPTIONS_H_ #define _OPTIONS_H_
...@@ -193,7 +173,7 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */ ...@@ -193,7 +173,7 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
*******************************************************************/ *******************************************************************/
#ifndef DROPBEAR_VERSION #ifndef DROPBEAR_VERSION
#define DROPBEAR_VERSION "0.44test1" #define DROPBEAR_VERSION "0.44test2"
#endif #endif
#define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment