RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 18:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2008/06/28 13:58:23

Browse Source 
[ssh-agent.c]
     refuse to add a key that has unknown constraints specified;
     ok markus
This commit is contained in:
Damien Miller 2008-06-30 00:05:21 +10:00
parent bd45afb5ad
commit 1cfadabc0e
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -34,6 +34,10 @@
- djm@cvs.openbsd.org 2008/06/28 07:25:07 - djm@cvs.openbsd.org 2008/06/28 07:25:07
[PROTOCOL] [PROTOCOL]
spelling fixes spelling fixes
- djm@cvs.openbsd.org 2008/06/28 13:58:23
[ssh-agent.c]
refuse to add a key that has unknown constraints specified;
ok markus
20080628 20080628
- (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec] - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
@ -4454,4 +4458,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5031 2008/06/29 14:04:57 djm Exp $ $Id: ChangeLog,v 1.5032 2008/06/29 14:05:21 djm Exp $

24
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.157 2007/09/25 23:48:57 canacar Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.158 2008/06/28 13:58:23 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -526,9 +526,8 @@ process_add_identity(SocketEntry *e, int version)
xfree(comment); xfree(comment);
goto send; goto send;
} }
success = 1;
while (buffer_len(&e->request)) { while (buffer_len(&e->request)) {
switch (buffer_get_char(&e->request)) { switch ((type = buffer_get_char(&e->request))) {
case SSH_AGENT_CONSTRAIN_LIFETIME: case SSH_AGENT_CONSTRAIN_LIFETIME:
death = time(NULL) + buffer_get_int(&e->request); death = time(NULL) + buffer_get_int(&e->request);
break; break;
@ -536,9 +535,14 @@ process_add_identity(SocketEntry *e, int version)
confirm = 1; confirm = 1;
break; break;
default: default:
break; error("process_add_identity: "
"Unknown constraint type %d", type);
xfree(comment);
key_free(k);
goto send;
} }
} }
success = 1;
if (lifetime && !death) if (lifetime && !death)
death = time(NULL) + lifetime; death = time(NULL) + lifetime;
if ((id = lookup_identity(k, version)) == NULL) { if ((id = lookup_identity(k, version)) == NULL) {
@ -604,10 +608,10 @@ no_identities(SocketEntry *e, u_int type)
#ifdef SMARTCARD #ifdef SMARTCARD
static void static void
process_add_smartcard_key (SocketEntry *e) process_add_smartcard_key(SocketEntry *e)
{ {
char *sc_reader_id = NULL, *pin; char *sc_reader_id = NULL, *pin;
int i, version, success = 0, death = 0, confirm = 0; int i, type, version, success = 0, death = 0, confirm = 0;
Key **keys, *k; Key **keys, *k;
Identity *id; Identity *id;
Idtab *tab; Idtab *tab;
@ -616,7 +620,7 @@ process_add_smartcard_key (SocketEntry *e)
pin = buffer_get_string(&e->request, NULL); pin = buffer_get_string(&e->request, NULL);
while (buffer_len(&e->request)) { while (buffer_len(&e->request)) {
switch (buffer_get_char(&e->request)) { switch ((type = buffer_get_char(&e->request))) {
case SSH_AGENT_CONSTRAIN_LIFETIME: case SSH_AGENT_CONSTRAIN_LIFETIME:
death = time(NULL) + buffer_get_int(&e->request); death = time(NULL) + buffer_get_int(&e->request);
break; break;
@ -624,7 +628,11 @@ process_add_smartcard_key (SocketEntry *e)
confirm = 1; confirm = 1;
break; break;
default: default:
break; error("process_add_smartcard_key: "
"Unknown constraint type %d", type);
xfree(sc_reader_id);
xfree(pin);
goto send;
} }
} }
if (lifetime && !death) if (lifetime && !death)