diff options
| author |   djm <djm@openbsd.org> | 2010-04-16 01:47:25 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-04-16 01:47:25 +0000 |
| commit | c3ded031a669caee89e4ee23e0ecd423f58e6370 (patch) | |
| tree | f27d771cafedf0f8611b9fec535729f8b4765228 /usr.bin/ssh/ssh-add.c | |
| parent | if there is no raid, do not allocate a 0-sized structure for sensors (diff) | |
| download | wireguard-openbsd-c3ded031a669caee89e4ee23e0ecd423f58e6370.tar.xz wireguard-openbsd-c3ded031a669caee89e4ee23e0ecd423f58e6370.zip | |
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 'usr.bin/ssh/ssh-add.c')
| -rw-r--r-- | usr.bin/ssh/ssh-add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c index 929d6f66828..f3113c7697d 100644 --- a/usr.bin/ssh/ssh-add.c +++ b/usr.bin/ssh/ssh-add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.94 2010/03/01 11:07:06 otto Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.95 2010/04/16 01:47:26 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -200,7 +200,7 @@ add_file(AuthenticationConnection *ac, const char *filename) xasprintf(&certpath, "%s-cert.pub", filename); if ((cert = key_load_public(certpath, NULL)) != NULL) { /* Graft with private bits */ - if (key_to_certified(private) != 0) + if (key_to_certified(private, key_cert_is_legacy(cert)) != 0) fatal("%s: key_to_certified failed", __func__); key_cert_copy(cert, private); key_free(cert); |