Module Name: src
Committed By: kamil
Date: Fri Aug 3 04:32:12 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: sshkey.c
Log Message:
Appease GCC in the openssh code when built with UBSan
Initialize eg to NULL in sshkey_ecdsa_key_to_nid().
The compiler warns that it might be uninitialized.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/sshkey.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/sshkey.c
diff -u src/crypto/external/bsd/openssh/dist/sshkey.c:1.14 src/crypto/external/bsd/openssh/dist/sshkey.c:1.15
--- src/crypto/external/bsd/openssh/dist/sshkey.c:1.14 Fri Apr 6 18:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/sshkey.c Fri Aug 3 04:32:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sshkey.c,v 1.14 2018/04/06 18:59:00 christos Exp $ */
+/* $NetBSD: sshkey.c,v 1.15 2018/08/03 04:32:12 kamil Exp $ */
/* $OpenBSD: sshkey.c,v 1.64 2018/03/22 07:05:48 markus Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-__RCSID("$NetBSD: sshkey.c,v 1.14 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: sshkey.c,v 1.15 2018/08/03 04:32:12 kamil Exp $");
#include <sys/types.h>
#include <netinet/in.h>
@@ -1641,7 +1641,7 @@ dsa_generate_private_key(u_int bits, DSA
int
sshkey_ecdsa_key_to_nid(EC_KEY *k)
{
- EC_GROUP *eg;
+ EC_GROUP *eg = NULL;
int nids[] = {
NID_X9_62_prime256v1,
NID_secp384r1,
