diff options
author | Damien Miller <djm@mindrot.org> | 2010-04-16 15:56:21 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-04-16 15:56:21 +1000 |
commit | 4e270b05dd9d850fb9e2e0ac43f33cb4090d3ebc (patch) | |
tree | 4fc84942b5966e9f38f18a1257ac43ddbed336be /ssh-agent.c | |
parent | 031c9100dfe3ee65a29084ebbd61965a76b3ad26 (diff) |
- djm@cvs.openbsd.org 2010/04/16 01:47:26
[PROTOCOL.certkeys auth-options.c auth-options.h auth-rsa.c]
[auth2-pubkey.c authfd.c key.c key.h myproposal.h ssh-add.c]
[ssh-agent.c ssh-dss.c ssh-keygen.1 ssh-keygen.c ssh-rsa.c]
[sshconnect.c sshconnect2.c sshd.c]
revised certificate format ssh-{dss,rsa}-cert-v01@openssh.com with the
following changes:
move the nonce field to the beginning of the certificate where it can
better protect against chosen-prefix attacks on the signature hash
Rename "constraints" field to "critical options"
Add a new non-critical "extensions" field
Add a serial number
The older format is still support for authentication and cert generation
(use "ssh-keygen -t v00 -s ca_key ..." to generate a v00 certificate)
ok markus@
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index b5c565271..2c0e28696 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.165 2010/02/26 20:29:54 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.166 2010/04/16 01:47:26 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -500,6 +500,7 @@ process_add_identity(SocketEntry *e, int version) | |||
500 | buffer_get_bignum2(&e->request, k->dsa->pub_key); | 500 | buffer_get_bignum2(&e->request, k->dsa->pub_key); |
501 | buffer_get_bignum2(&e->request, k->dsa->priv_key); | 501 | buffer_get_bignum2(&e->request, k->dsa->priv_key); |
502 | break; | 502 | break; |
503 | case KEY_DSA_CERT_V00: | ||
503 | case KEY_DSA_CERT: | 504 | case KEY_DSA_CERT: |
504 | cert = buffer_get_string(&e->request, &len); | 505 | cert = buffer_get_string(&e->request, &len); |
505 | if ((k = key_from_blob(cert, len)) == NULL) | 506 | if ((k = key_from_blob(cert, len)) == NULL) |
@@ -520,6 +521,7 @@ process_add_identity(SocketEntry *e, int version) | |||
520 | /* Generate additional parameters */ | 521 | /* Generate additional parameters */ |
521 | rsa_generate_additional_parameters(k->rsa); | 522 | rsa_generate_additional_parameters(k->rsa); |
522 | break; | 523 | break; |
524 | case KEY_RSA_CERT_V00: | ||
523 | case KEY_RSA_CERT: | 525 | case KEY_RSA_CERT: |
524 | cert = buffer_get_string(&e->request, &len); | 526 | cert = buffer_get_string(&e->request, &len); |
525 | if ((k = key_from_blob(cert, len)) == NULL) | 527 | if ((k = key_from_blob(cert, len)) == NULL) |
@@ -540,6 +542,7 @@ process_add_identity(SocketEntry *e, int version) | |||
540 | /* enable blinding */ | 542 | /* enable blinding */ |
541 | switch (k->type) { | 543 | switch (k->type) { |
542 | case KEY_RSA: | 544 | case KEY_RSA: |
545 | case KEY_RSA_CERT_V00: | ||
543 | case KEY_RSA_CERT: | 546 | case KEY_RSA_CERT: |
544 | case KEY_RSA1: | 547 | case KEY_RSA1: |
545 | if (RSA_blinding_on(k->rsa, NULL) != 1) { | 548 | if (RSA_blinding_on(k->rsa, NULL) != 1) { |