Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/openssh/dist Appease GCC in the openssh ...



details:   https://anonhg.NetBSD.org/src/rev/61d67a45418a
branches:  trunk
changeset: 834242:61d67a45418a
user:      kamil <kamil%NetBSD.org@localhost>
date:      Fri Aug 03 04:32:12 2018 +0000

description:
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.

diffstat:

 crypto/external/bsd/openssh/dist/sshkey.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c9b2b980d6c4 -r 61d67a45418a crypto/external/bsd/openssh/dist/sshkey.c
--- a/crypto/external/bsd/openssh/dist/sshkey.c Fri Aug 03 04:29:35 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/sshkey.c Fri Aug 03 04:32:12 2018 +0000
@@ -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 @@
 int
 sshkey_ecdsa_key_to_nid(EC_KEY *k)
 {
-       EC_GROUP *eg;
+       EC_GROUP *eg = NULL;
        int nids[] = {
                NID_X9_62_prime256v1,
                NID_secp384r1,



Home | Main Index | Thread Index | Old Index