tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- OpenBSD CVS Updates: 

- markus@cvs.openbsd.org  2000/06/18 18:50:11
     [auth2.c compat.c compat.h sshconnect2.c]
     make userauth+pubkey interop with ssh.com-2.2.0
   - markus@cvs.openbsd.org  2000/06/18 20:56:17
     [dsa.c]
     mem leak + be more paranoid in dsa_verify.
   - markus@cvs.openbsd.org  2000/06/18 21:29:50
     [key.c]
     cleanup fingerprinting, less hardcoded sizes
   - markus@cvs.openbsd.org  2000/06/19 19:39:45
     [atomicio.c auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
     [auth-rsa.c auth-skey.c authfd.c authfd.h authfile.c bufaux.c bufaux.h]
     [buffer.c buffer.h canohost.c channels.c channels.h cipher.c cipher.h]
     [clientloop.c compat.c compat.h compress.c compress.h crc32.c crc32.h]
     [deattack.c dispatch.c dsa.c fingerprint.c fingerprint.h getput.h hmac.c]
     [kex.c log-client.c log-server.c login.c match.c mpaux.c mpaux.h nchan.c]
     [nchan.h packet.c packet.h pty.c pty.h readconf.c readconf.h readpass.c]
     [rsa.c rsa.h scp.c servconf.c servconf.h ssh-add.c ssh-keygen.c ssh.c]
     [ssh.h tildexpand.c ttymodes.c ttymodes.h uidswap.c xmalloc.c xmalloc.h]
     OpenBSD tag
   - markus@cvs.openbsd.org  2000/06/21 10:46:10
     sshconnect2.c missing free; nuke old comment
This commit is contained in:
Damien Miller 2000-06-22 21:32:31 +10:00
parent 099f505f95
commit 6536c7d3c9
68 changed files with 138 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -2,6 +2,29 @@
- (djm) Automatically generate host key during "make install". Suggested - (djm) Automatically generate host key during "make install". Suggested
by Gary E. Miller <gem@rellim.com> by Gary E. Miller <gem@rellim.com>
- (djm) Paranoia before kill() system call - (djm) Paranoia before kill() system call
- OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/06/18 18:50:11
[auth2.c compat.c compat.h sshconnect2.c]
make userauth+pubkey interop with ssh.com-2.2.0
- markus@cvs.openbsd.org 2000/06/18 20:56:17
[dsa.c]
mem leak + be more paranoid in dsa_verify.
- markus@cvs.openbsd.org 2000/06/18 21:29:50
[key.c]
cleanup fingerprinting, less hardcoded sizes
- markus@cvs.openbsd.org 2000/06/19 19:39:45
[atomicio.c auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
[auth-rsa.c auth-skey.c authfd.c authfd.h authfile.c bufaux.c bufaux.h]
[buffer.c buffer.h canohost.c channels.c channels.h cipher.c cipher.h]
[clientloop.c compat.c compat.h compress.c compress.h crc32.c crc32.h]
[deattack.c dispatch.c dsa.c fingerprint.c fingerprint.h getput.h hmac.c]
[kex.c log-client.c log-server.c login.c match.c mpaux.c mpaux.h nchan.c]
[nchan.h packet.c packet.h pty.c pty.h readconf.c readconf.h readpass.c]
[rsa.c rsa.h scp.c servconf.c servconf.h ssh-add.c ssh-keygen.c ssh.c]
[ssh.h tildexpand.c ttymodes.c ttymodes.h uidswap.c xmalloc.c xmalloc.h]
OpenBSD tag
- markus@cvs.openbsd.org 2000/06/21 10:46:10
sshconnect2.c missing free; nuke old comment
20000620 20000620
- (djm) Replace use of '-o' and '-a' logical operators in configure tests - (djm) Replace use of '-o' and '-a' logical operators in configure tests

2
atomicio.c
View File

@ -24,7 +24,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: atomicio.c,v 1.11 2000/04/16 02:31:49 damien Exp $"); RCSID("$OpenBSD: atomicio.c,v 1.4 2000/06/20 01:39:37 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

2
auth-options.c
View File

@ -1,5 +1,5 @@
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-options.c,v 1.1 2000/06/18 04:50:44 djm Exp $"); RCSID("$OpenBSD: auth-options.c,v 1.2 2000/06/20 01:39:38 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "packet.h" #include "packet.h"

2
auth-passwd.c
View File

@ -11,7 +11,7 @@
#ifndef USE_PAM #ifndef USE_PAM
RCSID("$Id: auth-passwd.c,v 1.20 2000/05/20 05:03:00 damien Exp $"); RCSID("$OpenBSD: auth-passwd.c,v 1.16 2000/06/20 01:39:38 markus Exp $");
#include "packet.h" #include "packet.h"
#include "ssh.h" #include "ssh.h"

2
auth-rh-rsa.c
View File

@ -15,7 +15,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-rh-rsa.c,v 1.11 2000/04/16 02:31:49 damien Exp $"); RCSID("$OpenBSD: auth-rh-rsa.c,v 1.14 2000/06/20 01:39:38 markus Exp $");
#include "packet.h" #include "packet.h"
#include "ssh.h" #include "ssh.h"

2
auth-rhosts.c
View File

@ -16,7 +16,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-rhosts.c,v 1.8 2000/04/16 01:18:39 damien Exp $"); RCSID("$OpenBSD: auth-rhosts.c,v 1.14 2000/06/20 01:39:38 markus Exp $");
#include "packet.h" #include "packet.h"
#include "ssh.h" #include "ssh.h"

2
auth-rsa.c
View File

@ -16,7 +16,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-rsa.c,v 1.21 2000/06/18 04:50:44 djm Exp $"); RCSID("$OpenBSD: auth-rsa.c,v 1.26 2000/06/20 01:39:38 markus Exp $");
#include "rsa.h" #include "rsa.h"
#include "packet.h" #include "packet.h"

2
auth-skey.c
View File

@ -1,6 +1,6 @@
#include "includes.h" #include "includes.h"
#ifdef SKEY #ifdef SKEY
RCSID("$Id: auth-skey.c,v 1.6 2000/04/14 10:30:29 markus Exp $"); RCSID("$OpenBSD: auth-skey.c,v 1.7 2000/06/20 01:39:38 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "packet.h" #include "packet.h"

9
auth2.c
View File

@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth2.c,v 1.10 2000/06/18 04:05:02 markus Exp $"); RCSID("$OpenBSD: auth2.c,v 1.11 2000/06/19 00:50:11 markus Exp $");
#include <openssl/dsa.h> #include <openssl/dsa.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
@ -302,8 +302,11 @@ ssh2_auth_pubkey(struct passwd *pw, char *service)
sig = packet_get_string(&slen); sig = packet_get_string(&slen);
packet_done(); packet_done();
buffer_init(&b); buffer_init(&b);
buffer_append(&b, session_id2, session_id2_len); if (datafellows & SSH_COMPAT_SESSIONID_ENCODING) {
buffer_put_string(&b, session_id2, session_id2_len);
} else {
buffer_append(&b, session_id2, session_id2_len);
}
/* reconstruct packet */ /* reconstruct packet */
buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
buffer_put_cstring(&b, pw->pw_name); buffer_put_cstring(&b, pw->pw_name);

2
authfd.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: authfd.c,v 1.14 2000/04/30 00:00:53 damien Exp $"); RCSID("$OpenBSD: authfd.c,v 1.20 2000/06/20 01:39:38 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "rsa.h" #include "rsa.h"

2
authfd.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: authfd.h,v 1.5 2000/04/16 01:18:40 damien Exp $"); */ /* RCSID("$OpenBSD: authfd.h,v 1.8 2000/06/20 01:39:38 markus Exp $"); */
#ifndef AUTHFD_H #ifndef AUTHFD_H
#define AUTHFD_H #define AUTHFD_H

2
authfile.c
View File

@ -15,7 +15,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: authfile.c,v 1.12 2000/04/29 13:57:10 damien Exp $"); RCSID("$OpenBSD: authfile.c,v 1.17 2000/06/20 01:39:38 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>

2
bufaux.c
View File

@ -17,7 +17,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: bufaux.c,v 1.12 2000/04/16 02:31:50 damien Exp $"); RCSID("$OpenBSD: bufaux.c,v 1.12 2000/06/20 01:39:39 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include <openssl/bn.h> #include <openssl/bn.h>

2
bufaux.h
View File

@ -11,7 +11,7 @@
* *
*/ */
/* RCSID("$Id: bufaux.h,v 1.5 2000/04/16 01:18:40 damien Exp $"); */ /* RCSID("$OpenBSD: bufaux.h,v 1.7 2000/06/20 01:39:39 markus Exp $"); */
#ifndef BUFAUX_H #ifndef BUFAUX_H
#define BUFAUX_H #define BUFAUX_H

2
buffer.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: buffer.c,v 1.5 2000/04/16 01:18:40 damien Exp $"); RCSID("$OpenBSD: buffer.c,v 1.7 2000/06/20 01:39:39 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"

2
buffer.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: buffer.h,v 1.4 2000/04/16 02:31:50 damien Exp $"); */ /* RCSID("$OpenBSD: buffer.h,v 1.5 2000/06/20 01:39:39 markus Exp $"); */
#ifndef BUFFER_H #ifndef BUFFER_H
#define BUFFER_H #define BUFFER_H

2
canohost.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: canohost.c,v 1.9 2000/04/16 01:18:40 damien Exp $"); RCSID("$OpenBSD: canohost.c,v 1.13 2000/06/20 01:39:39 markus Exp $");
#include "packet.h" #include "packet.h"
#include "xmalloc.h" #include "xmalloc.h"

2
channels.c
View File

@ -17,7 +17,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: channels.c,v 1.33 2000/06/18 04:50:44 djm Exp $"); RCSID("$OpenBSD: channels.c,v 1.62 2000/06/20 01:39:39 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "packet.h" #include "packet.h"

2
channels.h
View File

@ -1,4 +1,4 @@
/* RCSID("$Id: channels.h,v 1.10 2000/06/07 09:55:44 djm Exp $"); */ /* RCSID("$OpenBSD: channels.h,v 1.14 2000/06/20 01:39:40 markus Exp $"); */
#ifndef CHANNELS_H #ifndef CHANNELS_H
#define CHANNELS_H #define CHANNELS_H

2
cipher.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: cipher.c,v 1.21 2000/05/30 03:44:52 damien Exp $"); RCSID("$OpenBSD: cipher.c,v 1.28 2000/06/20 01:39:40 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "cipher.h" #include "cipher.h"

2
cipher.h
View File

@ -11,7 +11,7 @@
* *
*/ */
/* RCSID("$Id: cipher.h,v 1.13 2000/05/09 01:03:00 damien Exp $"); */ /* RCSID("$OpenBSD: cipher.h,v 1.18 2000/06/20 01:39:40 markus Exp $"); */
#ifndef CIPHER_H #ifndef CIPHER_H
#define CIPHER_H #define CIPHER_H

2
clientloop.c
View File

@ -16,7 +16,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: clientloop.c,v 1.16 2000/05/09 01:03:00 damien Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.27 2000/06/20 01:39:40 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

4
compat.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: compat.c,v 1.12 2000/06/18 04:50:44 djm Exp $"); RCSID("$OpenBSD: compat.c,v 1.17 2000/06/20 01:39:40 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "packet.h" #include "packet.h"
@ -61,7 +61,7 @@ compat_datafellows(const char *version)
char *version; char *version;
int bugs; int bugs;
} check[] = { } check[] = {
{"2.2.0", SSH_BUG_HMAC}, {"2.2.0", SSH_BUG_HMAC|SSH_COMPAT_SESSIONID_ENCODING},
{"2.1.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC}, {"2.1.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC},
{"2.0.1", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|SSH_BUG_PUBKEYAUTH|SSH_BUG_X11FWD}, {"2.0.1", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|SSH_BUG_PUBKEYAUTH|SSH_BUG_X11FWD},
{NULL, 0} {NULL, 0}

3
compat.h
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* RCSID("$Id: compat.h,v 1.6 2000/05/09 01:03:00 damien Exp $"); */ /* RCSID("$OpenBSD: compat.h,v 1.9 2000/06/20 01:39:40 markus Exp $"); */
#ifndef COMPAT_H #ifndef COMPAT_H
#define COMPAT_H #define COMPAT_H
@ -40,6 +40,7 @@
#define SSH_BUG_PUBKEYAUTH 0x02 #define SSH_BUG_PUBKEYAUTH 0x02
#define SSH_BUG_HMAC 0x04 #define SSH_BUG_HMAC 0x04
#define SSH_BUG_X11FWD 0x08 #define SSH_BUG_X11FWD 0x08
#define SSH_COMPAT_SESSIONID_ENCODING 0x10
void enable_compat13(void); void enable_compat13(void);
void enable_compat20(void); void enable_compat20(void);

2
compress.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: compress.c,v 1.6 2000/04/16 01:18:42 damien Exp $"); RCSID("$OpenBSD: compress.c,v 1.8 2000/06/20 01:39:40 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "buffer.h" #include "buffer.h"

2
compress.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: compress.h,v 1.4 2000/04/16 01:18:42 damien Exp $"); */ /* RCSID("$OpenBSD: compress.h,v 1.5 2000/06/20 01:39:40 markus Exp $"); */
#ifndef COMPRESS_H #ifndef COMPRESS_H
#define COMPRESS_H #define COMPRESS_H

2
crc32.c
View File

@ -6,7 +6,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: crc32.c,v 1.2 1999/11/24 13:26:22 damien Exp $"); RCSID("$OpenBSD: crc32.c,v 1.5 2000/06/20 01:39:40 markus Exp $");
#include "crc32.h" #include "crc32.h"

2
crc32.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: crc32.h,v 1.4 2000/04/16 01:18:42 damien Exp $"); */ /* RCSID("$OpenBSD: crc32.h,v 1.6 2000/06/20 01:39:40 markus Exp $"); */
#ifndef CRC32_H #ifndef CRC32_H
#define CRC32_H #define CRC32_H

2
deattack.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: deattack.c,v 1.3 1999/11/24 13:26:22 damien Exp $ * $OpenBSD: deattack.c,v 1.7 2000/06/20 01:39:41 markus Exp $
* Cryptographic attack detector for ssh - source code * Cryptographic attack detector for ssh - source code
* *
* Copyright (c) 1998 CORE SDI S.A., Buenos Aires, Argentina. * Copyright (c) 1998 CORE SDI S.A., Buenos Aires, Argentina.

2
dispatch.c
View File

@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: dispatch.c,v 1.3 2000/04/16 01:18:42 damien Exp $"); RCSID("$OpenBSD: dispatch.c,v 1.3 2000/06/20 01:39:41 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "dispatch.h" #include "dispatch.h"
#include "packet.h" #include "packet.h"

17
dsa.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: dsa.c,v 1.7 2000/05/08 17:42:24 markus Exp $"); RCSID("$OpenBSD: dsa.c,v 1.9 2000/06/20 01:39:41 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -72,7 +72,7 @@ dsa_key_from_blob(
buffer_append(&b, blob, blen); buffer_append(&b, blob, blen);
ktype = buffer_get_string(&b, NULL); ktype = buffer_get_string(&b, NULL);
if (strcmp(KEX_DSS, ktype) != 0) { if (strcmp(KEX_DSS, ktype) != 0) {
error("dsa_key_from_blob: cannot handle type %s", ktype); error("dsa_key_from_blob: cannot handle type %s", ktype);
key_free(key); key_free(key);
return NULL; return NULL;
} }
@ -197,7 +197,6 @@ dsa_verify(
DSA_SIG *sig; DSA_SIG *sig;
EVP_MD *evp_md = EVP_sha1(); EVP_MD *evp_md = EVP_sha1();
EVP_MD_CTX md; EVP_MD_CTX md;
char *ktype;
unsigned char *sigblob; unsigned char *sigblob;
char *txt; char *txt;
unsigned int len; unsigned int len;
@ -227,14 +226,24 @@ dsa_verify(
len = signaturelen; len = signaturelen;
} else { } else {
/* ietf-drafts */ /* ietf-drafts */
char *ktype;
buffer_init(&b); buffer_init(&b);
buffer_append(&b, (char *) signature, signaturelen); buffer_append(&b, (char *) signature, signaturelen);
ktype = buffer_get_string(&b, NULL); ktype = buffer_get_string(&b, NULL);
if (strcmp(KEX_DSS, ktype) != 0) {
error("dsa_verify: cannot handle type %s", ktype);
buffer_free(&b);
return -1;
}
sigblob = (unsigned char *)buffer_get_string(&b, &len); sigblob = (unsigned char *)buffer_get_string(&b, &len);
rlen = buffer_len(&b); rlen = buffer_len(&b);
if(rlen != 0) if(rlen != 0) {
error("remaining bytes in signature %d", rlen); error("remaining bytes in signature %d", rlen);
buffer_free(&b);
return -1;
}
buffer_free(&b); buffer_free(&b);
xfree(ktype);
} }
if (len != SIGBLOB_LEN) { if (len != SIGBLOB_LEN) {

2
fingerprint.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: fingerprint.c,v 1.6 2000/04/12 09:39:10 markus Exp $"); RCSID("$OpenBSD: fingerprint.c,v 1.7 2000/06/20 01:39:41 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"

2
fingerprint.h
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* RCSID("$Id: fingerprint.h,v 1.3 1999/11/24 16:15:25 markus Exp $"); */ /* RCSID("$OpenBSD: fingerprint.h,v 1.4 2000/06/20 01:39:41 markus Exp $"); */
#ifndef FINGERPRINT_H #ifndef FINGERPRINT_H
#define FINGERPRINT_H #define FINGERPRINT_H

2
getput.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: getput.h,v 1.3 2000/04/16 01:18:42 damien Exp $"); */ /* RCSID("$OpenBSD: getput.h,v 1.4 2000/06/20 01:39:41 markus Exp $"); */
#ifndef GETPUT_H #ifndef GETPUT_H
#define GETPUT_H #define GETPUT_H

2
hmac.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: hmac.c,v 1.2 2000/04/12 09:39:10 markus Exp $"); RCSID("$OpenBSD: hmac.c,v 1.3 2000/06/20 01:39:41 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

2
kex.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: kex.c,v 1.9 2000/05/30 03:44:53 damien Exp $"); RCSID("$OpenBSD: kex.c,v 1.8 2000/06/20 01:39:41 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh2.h" #include "ssh2.h"

27
key.c
View File

@ -121,8 +121,6 @@ key_equal(Key *a, Key *b)
return 0; return 0;
} }
#define FPRINT "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x"
/* /*
* Generate key fingerprint in ascii format. * Generate key fingerprint in ascii format.
* Based on ideas and code from Bjoern Groenvall <bg@sics.se> * Based on ideas and code from Bjoern Groenvall <bg@sics.se>
@ -130,7 +128,7 @@ key_equal(Key *a, Key *b)
char * char *
key_fingerprint(Key *k) key_fingerprint(Key *k)
{ {
static char retval[80]; static char retval[(EVP_MAX_MD_SIZE+1)*3];
unsigned char *blob = NULL; unsigned char *blob = NULL;
int len = 0; int len = 0;
int nlen, elen; int nlen, elen;
@ -151,15 +149,22 @@ key_fingerprint(Key *k)
fatal("key_fingerprint: bad key type %d", k->type); fatal("key_fingerprint: bad key type %d", k->type);
break; break;
} }
retval[0] = '\0';
if (blob != NULL) { if (blob != NULL) {
unsigned char d[16]; int i;
EVP_MD_CTX md; unsigned char digest[EVP_MAX_MD_SIZE];
EVP_DigestInit(&md, EVP_md5()); EVP_MD *md = EVP_md5();
EVP_DigestUpdate(&md, blob, len); EVP_MD_CTX ctx;
EVP_DigestFinal(&md, d, NULL); EVP_DigestInit(&ctx, md);
snprintf(retval, sizeof(retval), FPRINT, EVP_DigestUpdate(&ctx, blob, len);
d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], EVP_DigestFinal(&ctx, digest, NULL);
d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); for(i = 0; i < md->md_size; i++) {
char hex[4];
snprintf(hex, sizeof(hex), "%02x:", digest[i]);
strlcat(retval, hex, sizeof(retval));
}
retval[strlen(retval) - 1] = '\0';
memset(blob, 0, len); memset(blob, 0, len);
xfree(blob); xfree(blob);
} }

2
log-client.c
View File

@ -15,7 +15,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: log-client.c,v 1.6 2000/04/16 01:18:43 damien Exp $"); RCSID("$OpenBSD: log-client.c,v 1.9 2000/06/20 01:39:42 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

2
log-server.c
View File

@ -15,7 +15,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: log-server.c,v 1.10 2000/05/01 23:56:42 damien Exp $"); RCSID("$OpenBSD: log-server.c,v 1.15 2000/06/20 01:39:42 markus Exp $");
#include <syslog.h> #include <syslog.h>
#include "packet.h" #include "packet.h"

2
login.c
View File

@ -18,7 +18,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: login.c,v 1.32 2000/06/04 17:07:49 andre Exp $"); RCSID("$OpenBSD: login.c,v 1.14 2000/06/20 01:39:42 markus Exp $");
#include "loginrec.h" #include "loginrec.h"

2
match.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: match.c,v 1.6 2000/06/07 09:55:44 djm Exp $"); RCSID("$OpenBSD: match.c,v 1.8 2000/06/20 01:39:42 markus Exp $");
#include "ssh.h" #include "ssh.h"

2
mpaux.c
View File

@ -15,7 +15,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: mpaux.c,v 1.12 2000/04/16 02:31:51 damien Exp $"); RCSID("$OpenBSD: mpaux.c,v 1.13 2000/06/20 01:39:42 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include "getput.h" #include "getput.h"

2
mpaux.h
View File

@ -13,7 +13,7 @@
* precision integers. * precision integers.
*/ */
/* RCSID("$Id: mpaux.h,v 1.5 2000/04/16 01:18:43 damien Exp $"); */ /* RCSID("$OpenBSD: mpaux.h,v 1.7 2000/06/20 01:39:42 markus Exp $"); */
#ifndef MPAUX_H #ifndef MPAUX_H
#define MPAUX_H #define MPAUX_H

2
nchan.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: nchan.c,v 1.10 2000/05/09 01:03:01 damien Exp $"); RCSID("$OpenBSD: nchan.c,v 1.18 2000/06/20 01:39:42 markus Exp $");
#include "ssh.h" #include "ssh.h"

2
nchan.h
View File

@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* RCSID("$Id: nchan.h,v 1.5 2000/04/04 04:39:02 damien Exp $"); */ /* RCSID("$OpenBSD: nchan.h,v 1.8 2000/06/20 01:39:43 markus Exp $"); */
#ifndef NCHAN_H #ifndef NCHAN_H
#define NCHAN_H #define NCHAN_H

2
packet.c
View File

@ -17,7 +17,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: packet.c,v 1.23 2000/05/17 12:53:35 damien Exp $"); RCSID("$OpenBSD: packet.c,v 1.33 2000/06/20 01:39:43 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"

2
packet.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: packet.h,v 1.15 2000/04/16 02:31:51 damien Exp $"); */ /* RCSID("$OpenBSD: packet.h,v 1.16 2000/06/20 01:39:43 markus Exp $"); */
#ifndef PACKET_H #ifndef PACKET_H
#define PACKET_H #define PACKET_H

2
pty.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: pty.c,v 1.19 2000/04/20 13:12:59 damien Exp $"); RCSID("$OpenBSD: pty.c,v 1.14 2000/06/20 01:39:43 markus Exp $");
#ifdef HAVE_UTIL_H #ifdef HAVE_UTIL_H
# include <util.h> # include <util.h>

2
pty.h
View File

@ -13,7 +13,7 @@
* tty. * tty.
*/ */
/* RCSID("$Id: pty.h,v 1.8 2000/04/16 01:18:44 damien Exp $"); */ /* RCSID("$OpenBSD: pty.h,v 1.7 2000/06/20 01:39:43 markus Exp $"); */
#ifndef PTY_H #ifndef PTY_H
#define PTY_H #define PTY_H

2
readconf.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: readconf.c,v 1.17 2000/06/18 04:50:44 djm Exp $"); RCSID("$OpenBSD: readconf.c,v 1.37 2000/06/20 01:39:43 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "cipher.h" #include "cipher.h"

2
readconf.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: readconf.h,v 1.12 2000/06/07 09:55:44 djm Exp $"); */ /* RCSID("$OpenBSD: readconf.h,v 1.20 2000/06/20 01:39:43 markus Exp $"); */
#ifndef READCONF_H #ifndef READCONF_H
#define READCONF_H #define READCONF_H

2
readpass.c
View File

@ -32,7 +32,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: readpass.c,v 1.6 2000/04/16 01:18:44 damien Exp $"); RCSID("$OpenBSD: readpass.c,v 1.11 2000/06/20 01:39:44 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

2
rsa.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: rsa.c,v 1.14 2000/04/16 01:18:45 damien Exp $"); RCSID("$OpenBSD: rsa.c,v 1.15 2000/06/20 01:39:44 markus Exp $");
#include "rsa.h" #include "rsa.h"
#include "ssh.h" #include "ssh.h"

2
rsa.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: rsa.h,v 1.9 2000/04/16 02:31:51 damien Exp $"); */ /* RCSID("$OpenBSD: rsa.h,v 1.7 2000/06/20 01:39:44 markus Exp $"); */
#ifndef RSA_H #ifndef RSA_H
#define RSA_H #define RSA_H

4
scp.c
View File

@ -45,7 +45,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: scp.c,v 1.24 2000/06/18 04:50:44 djm Exp $"); RCSID("$OpenBSD: scp.c,v 1.32 2000/06/20 01:39:44 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -1007,7 +1007,7 @@ run_err(const char *fmt,...)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: scp.c,v 1.24 2000/06/18 04:50:44 djm Exp $ * $OpenBSD: scp.c,v 1.32 2000/06/20 01:39:44 markus Exp $
*/ */
char * char *

2
servconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: servconf.c,v 1.19 2000/06/18 04:50:44 djm Exp $"); RCSID("$OpenBSD: servconf.c,v 1.45 2000/06/20 01:39:44 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "servconf.h" #include "servconf.h"

2
servconf.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: servconf.h,v 1.13 2000/06/18 04:50:44 djm Exp $"); */ /* RCSID("$OpenBSD: servconf.h,v 1.25 2000/06/20 01:39:44 markus Exp $"); */
#ifndef SERVCONF_H #ifndef SERVCONF_H
#define SERVCONF_H #define SERVCONF_H

2
ssh-add.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: ssh-add.c,v 1.18 2000/05/01 10:59:50 damien Exp $"); RCSID("$OpenBSD: ssh-add.c,v 1.17 2000/06/20 01:39:44 markus Exp $");
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>

2
ssh-keygen.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: ssh-keygen.c,v 1.19 2000/06/07 09:55:44 djm Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.27 2000/06/20 01:39:44 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>

2
ssh.c
View File

@ -11,7 +11,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: ssh.c,v 1.34 2000/06/07 09:55:44 djm Exp $"); RCSID("$OpenBSD: ssh.c,v 1.56 2000/06/20 01:39:44 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>

2
ssh.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: ssh.h,v 1.40 2000/05/17 12:34:24 damien Exp $"); */ /* RCSID("$OpenBSD: ssh.h,v 1.47 2000/06/20 01:39:45 markus Exp $"); */
#ifndef SSH_H #ifndef SSH_H
#define SSH_H #define SSH_H

20
sshconnect2.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.13 2000/06/02 02:00:19 todd Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.15 2000/06/21 16:46:10 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
@ -295,6 +295,7 @@ ssh2_try_pubkey(char *filename,
unsigned char *blob, *signature; unsigned char *blob, *signature;
int bloblen, slen; int bloblen, slen;
struct stat st; struct stat st;
int skip = 0;
if (stat(filename, &st) != 0) { if (stat(filename, &st) != 0) {
debug("key does not exist: %s", filename); debug("key does not exist: %s", filename);
@ -314,14 +315,22 @@ ssh2_try_pubkey(char *filename,
success = load_private_key(filename, passphrase, k, NULL); success = load_private_key(filename, passphrase, k, NULL);
memset(passphrase, 0, strlen(passphrase)); memset(passphrase, 0, strlen(passphrase));
xfree(passphrase); xfree(passphrase);
if (!success) if (!success) {
key_free(k);
return 0; return 0;
}
} }
dsa_make_key_blob(k, &blob, &bloblen); dsa_make_key_blob(k, &blob, &bloblen);
/* data to be signed */ /* data to be signed */
buffer_init(&b); buffer_init(&b);
buffer_append(&b, session_id2, session_id2_len); if (datafellows & SSH_COMPAT_SESSIONID_ENCODING) {
buffer_put_string(&b, session_id2, session_id2_len);
skip = buffer_len(&b);
} else {
buffer_append(&b, session_id2, session_id2_len);
skip = session_id2_len;
}
buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
buffer_put_cstring(&b, server_user); buffer_put_cstring(&b, server_user);
buffer_put_cstring(&b, buffer_put_cstring(&b,
@ -340,7 +349,6 @@ ssh2_try_pubkey(char *filename,
buffer_dump(&b); buffer_dump(&b);
#endif #endif
if (datafellows & SSH_BUG_PUBKEYAUTH) { if (datafellows & SSH_BUG_PUBKEYAUTH) {
/* e.g. ssh-2.0.13: data-to-be-signed != data-on-the-wire */
buffer_clear(&b); buffer_clear(&b);
buffer_append(&b, session_id2, session_id2_len); buffer_append(&b, session_id2, session_id2_len);
buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
@ -357,9 +365,9 @@ ssh2_try_pubkey(char *filename,
xfree(signature); xfree(signature);
/* skip session id and packet type */ /* skip session id and packet type */
if (buffer_len(&b) < session_id2_len + 1) if (buffer_len(&b) < skip + 1)
fatal("ssh2_try_pubkey: internal error"); fatal("ssh2_try_pubkey: internal error");
buffer_consume(&b, session_id2_len + 1); buffer_consume(&b, skip + 1);
/* put remaining data from buffer into packet */ /* put remaining data from buffer into packet */
packet_start(SSH2_MSG_USERAUTH_REQUEST); packet_start(SSH2_MSG_USERAUTH_REQUEST);

2
tildexpand.c
View File

@ -6,7 +6,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: tildexpand.c,v 1.4 1999/12/07 04:38:32 damien Exp $"); RCSID("$OpenBSD: tildexpand.c,v 1.7 2000/06/20 01:39:45 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

2
ttymodes.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: ttymodes.c,v 1.4 2000/04/16 01:18:49 damien Exp $"); RCSID("$OpenBSD: ttymodes.c,v 1.7 2000/06/20 01:39:45 markus Exp $");
#include "packet.h" #include "packet.h"
#include "ssh.h" #include "ssh.h"

2
ttymodes.h
View File

@ -12,7 +12,7 @@
* *
*/ */
/* RCSID("$Id: ttymodes.h,v 1.4 2000/04/16 01:18:49 damien Exp $"); */ /* RCSID("$OpenBSD: ttymodes.h,v 1.8 2000/06/20 01:39:45 markus Exp $"); */
/* The tty mode description is a stream of bytes. The stream consists of /* The tty mode description is a stream of bytes. The stream consists of
* opcode-arguments pairs. It is terminated by opcode TTY_OP_END (0). * opcode-arguments pairs. It is terminated by opcode TTY_OP_END (0).

2
uidswap.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: uidswap.c,v 1.5 2000/04/16 01:18:49 damien Exp $"); RCSID("$OpenBSD: uidswap.c,v 1.7 2000/06/20 01:39:45 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "uidswap.h" #include "uidswap.h"

2
xmalloc.c
View File

@ -8,7 +8,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: xmalloc.c,v 1.3 2000/04/16 01:18:49 damien Exp $"); RCSID("$OpenBSD: xmalloc.c,v 1.7 2000/06/20 01:39:45 markus Exp $");
#include "ssh.h" #include "ssh.h"

2
xmalloc.h
View File

@ -14,7 +14,7 @@
* *
*/ */
/* RCSID("$Id: xmalloc.h,v 1.3 2000/04/16 01:18:49 damien Exp $"); */ /* RCSID("$OpenBSD: xmalloc.h,v 1.4 2000/06/20 01:39:45 markus Exp $"); */
#ifndef XMALLOC_H #ifndef XMALLOC_H
#define XMALLOC_H #define XMALLOC_H