Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/ssh-add.c,v
rcsdiff: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/ssh-add.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- src/crypto/external/bsd/openssh/dist/ssh-add.c	2015/07/03 01:00:00	1.11
+++ src/crypto/external/bsd/openssh/dist/ssh-add.c	2015/08/13 10:33:21	1.12
@@ -1,5 +1,5 @@
-/*	$NetBSD: ssh-add.c,v 1.11 2015/07/03 01:00:00 christos Exp $	*/
-/* $OpenBSD: ssh-add.c,v 1.122 2015/03/26 12:32:38 naddy Exp $ */
+/*	$NetBSD: ssh-add.c,v 1.12 2015/08/13 10:33:21 christos Exp $	*/
+/* $OpenBSD: ssh-add.c,v 1.123 2015/07/03 03:43:18 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-add.c,v 1.11 2015/07/03 01:00:00 christos Exp $");
+__RCSID("$NetBSD: ssh-add.c,v 1.12 2015/08/13 10:33:21 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -297,8 +297,7 @@ add_file(int agent_fd, const char *filen
 	} 
 
 	/* Graft with private bits */
-	if ((r = sshkey_to_certified(private,
-	    sshkey_cert_is_legacy(cert))) != 0) {
+	if ((r = sshkey_to_certified(private)) != 0) {
 		error("%s: sshkey_to_certified: %s", __func__, ssh_err(r));
 		sshkey_free(cert);
 		goto out;