diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-06-15 00:01:37 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-06-15 00:01:37 +0000 |
| commit | 7415b5040940815249a7f97d266c068b094df5c1 (patch) | |
| tree | 34abe0c570339ad961002819fa06054a7db4070f /usr.bin/ssh/authfd.c | |
| parent | 592b4684a393f187ed17f2dbde89e7e974b93bec (diff) | |
break agent key lifetime protocol and allow other contraints for key usage.
Diffstat (limited to 'usr.bin/ssh/authfd.c')
| -rw-r--r-- | usr.bin/ssh/authfd.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/authfd.c b/usr.bin/ssh/authfd.c index 0f84e321cf9..b16bc470b6f 100644 --- a/usr.bin/ssh/authfd.c +++ b/usr.bin/ssh/authfd.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfd.c,v 1.51 2002/06/05 21:55:44 markus Exp $"); +RCSID("$OpenBSD: authfd.c,v 1.52 2002/06/15 00:01:36 markus Exp $"); #include <openssl/evp.h> @@ -552,7 +552,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key) } int -ssh_lifetime_identity(AuthenticationConnection *auth, Key *key, u_int life) +ssh_contrain_identity(AuthenticationConnection *auth, Key *key, u_int life) { Buffer msg; int type; @@ -562,21 +562,22 @@ ssh_lifetime_identity(AuthenticationConnection *auth, Key *key, u_int life) buffer_init(&msg); if (key->type == KEY_RSA1) { - buffer_put_char(&msg, SSH_AGENTC_LIFETIME_IDENTITY1); - buffer_put_int(&msg, life); + buffer_put_char(&msg, SSH_AGENTC_CONTRAIN_IDENTITY1); buffer_put_int(&msg, BN_num_bits(key->rsa->n)); buffer_put_bignum(&msg, key->rsa->e); buffer_put_bignum(&msg, key->rsa->n); } else if (key->type == KEY_DSA || key->type == KEY_RSA) { key_to_blob(key, &blob, &blen); - buffer_put_char(&msg, SSH_AGENTC_LIFETIME_IDENTITY); - buffer_put_int(&msg, life); + buffer_put_char(&msg, SSH_AGENTC_CONTRAIN_IDENTITY); buffer_put_string(&msg, blob, blen); xfree(blob); } else { buffer_free(&msg); return 0; } + buffer_put_char(&msg, SSH_AGENT_CONTRAIN_LIFETIME); + buffer_put_int(&msg, life); + if (ssh_request_reply(auth, &msg, &msg) == 0) { buffer_free(&msg); return 0; |