From 4e270b05dd9d850fb9e2e0ac43f33cb4090d3ebc Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 16 Apr 2010 15:56:21 +1000 Subject: - 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@ --- ssh-add.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ssh-add.c') diff --git a/ssh-add.c b/ssh-add.c index ad9f7a83e..cba1078b4 100644 --- a/ssh-add.c +++ b/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -204,7 +204,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); -- cgit v1.2.3 From c6afb5f2c095a6a4380cc13a6480abb7614d949f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 21 May 2010 14:56:47 +1000 Subject: - djm@cvs.openbsd.org 2010/05/14 00:47:22 [ssh-add.c] check that the certificate matches the corresponding private key before grafting it on --- ChangeLog | 4 ++++ ssh-add.c | 50 +++++++++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 21 deletions(-) (limited to 'ssh-add.c') diff --git a/ChangeLog b/ChangeLog index d5a5aa6d2..b90af22b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ - djm@cvs.openbsd.org 2010/05/11 02:58:04 [auth-rsa.c] don't accept certificates marked as "cert-authority" here; ok markus@ + - djm@cvs.openbsd.org 2010/05/14 00:47:22 + [ssh-add.c] + check that the certificate matches the corresponding private key before + grafting it on 20100511 - (dtucker) [Makefile.in] Bug #1770: Link libopenbsd-compat twice to solve diff --git a/ssh-add.c b/ssh-add.c index cba1078b4..fb641ec48 100644 --- a/ssh-add.c +++ b/ssh-add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.95 2010/04/16 01:47:26 djm Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.96 2010/05/14 00:47:22 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -194,7 +194,7 @@ add_file(AuthenticationConnection *ac, const char *filename) "Lifetime set to %d seconds\n", lifetime); if (confirm != 0) fprintf(stderr, - "The user has to confirm each use of the key\n"); + "The user must confirm each use of the key\n"); } else { fprintf(stderr, "Could not add identity: %s\n", filename); } @@ -202,29 +202,37 @@ add_file(AuthenticationConnection *ac, const char *filename) /* Now try to add the certificate flavour too */ xasprintf(&certpath, "%s-cert.pub", filename); - if ((cert = key_load_public(certpath, NULL)) != NULL) { - /* Graft with private bits */ - if (key_to_certified(private, key_cert_is_legacy(cert)) != 0) - fatal("%s: key_to_certified failed", __func__); - key_cert_copy(cert, private); + if ((cert = key_load_public(certpath, NULL)) == NULL) + goto out; + + if (!key_equal_public(cert, private)) { + error("Certificate %s does not match private key %s", + certpath, filename); key_free(cert); + goto out; + } - if (ssh_add_identity_constrained(ac, private, comment, - lifetime, confirm)) { - fprintf(stderr, "Certificate added: %s (%s)\n", - certpath, private->cert->key_id); - if (lifetime != 0) - fprintf(stderr, "Lifetime set to %d seconds\n", - lifetime); - if (confirm != 0) - fprintf(stderr, "The user has to confirm each " - "use of the key\n"); - } else { - error("Certificate %s (%s) add failed", certpath, - private->cert->key_id); - } + /* Graft with private bits */ + if (key_to_certified(private, key_cert_is_legacy(cert)) != 0) { + error("%s: key_to_certified failed", __func__); + key_free(cert); + goto out; } + key_cert_copy(cert, private); + key_free(cert); + if (!ssh_add_identity_constrained(ac, private, comment, + lifetime, confirm)) { + error("Certificate %s (%s) add failed", certpath, + private->cert->key_id); + } + fprintf(stderr, "Certificate added: %s (%s)\n", certpath, + private->cert->key_id); + if (lifetime != 0) + fprintf(stderr, "Lifetime set to %d seconds\n", lifetime); + if (confirm != 0) + fprintf(stderr, "The user must confirm each use of the key\n"); + out: xfree(certpath); xfree(comment); key_free(private); -- cgit v1.2.3