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 /sshconnect2.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 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 25a3323f0..e146a4b26 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.181 2010/04/10 02:10:56 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.182 2010/04/16 01:47:26 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1140,8 +1140,11 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id) | |||
1140 | u_int skip = 0; | 1140 | u_int skip = 0; |
1141 | int ret = -1; | 1141 | int ret = -1; |
1142 | int have_sig = 1; | 1142 | int have_sig = 1; |
1143 | char *fp; | ||
1143 | 1144 | ||
1144 | debug3("sign_and_send_pubkey"); | 1145 | fp = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); |
1146 | debug3("sign_and_send_pubkey: %s %s", key_type(id->key), fp); | ||
1147 | xfree(fp); | ||
1145 | 1148 | ||
1146 | if (key_to_blob(id->key, &blob, &bloblen) == 0) { | 1149 | if (key_to_blob(id->key, &blob, &bloblen) == 0) { |
1147 | /* we cannot handle this key */ | 1150 | /* we cannot handle this key */ |