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-rsa.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-rsa.c')
-rw-r--r-- | ssh-rsa.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-rsa.c,v 1.40 2010/02/26 20:29:54 djm Exp $ */ | 1 | /* $OpenBSD: ssh-rsa.c,v 1.41 2010/04/16 01:47:26 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> | 3 | * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> |
4 | * | 4 | * |
@@ -46,9 +46,8 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp, | |||
46 | int ok, nid; | 46 | int ok, nid; |
47 | Buffer b; | 47 | Buffer b; |
48 | 48 | ||
49 | if (key == NULL || | 49 | if (key == NULL || key->rsa == NULL || (key->type != KEY_RSA && |
50 | (key->type != KEY_RSA && key->type != KEY_RSA_CERT) || | 50 | key->type != KEY_RSA_CERT && key->type != KEY_RSA_CERT_V00)) { |
51 | key->rsa == NULL) { | ||
52 | error("ssh_rsa_sign: no RSA key"); | 51 | error("ssh_rsa_sign: no RSA key"); |
53 | return -1; | 52 | return -1; |
54 | } | 53 | } |
@@ -115,9 +114,8 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen, | |||
115 | u_int len, dlen, modlen; | 114 | u_int len, dlen, modlen; |
116 | int rlen, ret, nid; | 115 | int rlen, ret, nid; |
117 | 116 | ||
118 | if (key == NULL || | 117 | if (key == NULL || key->rsa == NULL || (key->type != KEY_RSA && |
119 | (key->type != KEY_RSA && key->type != KEY_RSA_CERT) || | 118 | key->type != KEY_RSA_CERT && key->type != KEY_RSA_CERT_V00)) { |
120 | key->rsa == NULL) { | ||
121 | error("ssh_rsa_verify: no RSA key"); | 119 | error("ssh_rsa_verify: no RSA key"); |
122 | return -1; | 120 | return -1; |
123 | } | 121 | } |