From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 4 Oct 2019 03:26:58 +0000 (+0000)
Subject: upstream: Check for gmtime failure in moduli generation. Based on
X-Git-Tag: V_8_1_P1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=714031a10bbe378a395a93cf1040f4ee1451f45f;p=thirdparty%2Fopenssh-portable.git

upstream: Check for gmtime failure in moduli generation. Based on

patch from krishnaiah.bommu@intel.com, ok djm@

OpenBSD-Commit-ID: 4c6a4cde0022188ac83737de08da0e875704eeaa
---

diff --git a/moduli.c b/moduli.c
index 578fc485c..4f6f8da8d 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.35 2019/07/03 03:24:02 deraadt Exp $ */
+/* $OpenBSD: moduli.c,v 1.36 2019/10/04 03:26:58 dtucker Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -159,6 +159,8 @@ qfileout(FILE * ofile, u_int32_t otype, u_int32_t otests, u_int32_t otries,
 
 	time(&time_now);
 	gtm = gmtime(&time_now);
+	if (gtm == NULL)
+		return -1;
 
 	res = fprintf(ofile, "%04d%02d%02d%02d%02d%02d %u %u %u %u %x ",
 	    gtm->tm_year + 1900, gtm->tm_mon + 1, gtm->tm_mday,