Module Name: src
Committed By: christos
Date: Sat Oct 7 21:14:59 UTC 2017
Modified Files:
src/crypto/external/bsd/openssh/dist: includes.h
src/crypto/external/bsd/openssh/lib: Makefile
Added Files:
src/crypto/external/bsd/openssh/dist: recallocarray.c
Log Message:
define recallocarray locally.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/includes.h
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/dist/recallocarray.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/lib/Makefile
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/includes.h
diff -u src/crypto/external/bsd/openssh/dist/includes.h:1.6 src/crypto/external/bsd/openssh/dist/includes.h:1.7
--- src/crypto/external/bsd/openssh/dist/includes.h:1.6 Tue Apr 18 14:41:46 2017
+++ src/crypto/external/bsd/openssh/dist/includes.h Sat Oct 7 17:14:59 2017
@@ -1,9 +1,11 @@
-/* $NetBSD: includes.h,v 1.6 2017/04/18 18:41:46 christos Exp $ */
+/* $NetBSD: includes.h,v 1.7 2017/10/07 21:14:59 christos Exp $ */
#include <sys/cdefs.h>
#ifndef __OpenBSD__
#define __bounded__(a, b, c)
#define explicit_bzero(a, b) explicit_memset((a), 0, (b))
#define timingsafe_bcmp(a, b, c) (!consttime_memequal((a), (b), (c)))
+#include <sys/types.h>
+void *recallocarray(void *, size_t, size_t, size_t);
#endif
#include "namespace.h"
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.22 src/crypto/external/bsd/openssh/lib/Makefile:1.23
--- src/crypto/external/bsd/openssh/lib/Makefile:1.22 Sat Oct 7 15:39:19 2017
+++ src/crypto/external/bsd/openssh/lib/Makefile Sat Oct 7 17:14:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/10/07 19:39:19 christos Exp $
+# $NetBSD: Makefile,v 1.23 2017/10/07 21:14:59 christos Exp $
.include <bsd.own.mk>
@@ -57,6 +57,7 @@ packet.c \
poly1305.c \
progressmeter.c \
readpass.c \
+recallocarray.c \
sc25519.c \
smult_curve25519_ref.c \
sshbuf-getput-basic.c \
Added files:
Index: src/crypto/external/bsd/openssh/dist/recallocarray.c
diff -u /dev/null src/crypto/external/bsd/openssh/dist/recallocarray.c:1.1
--- /dev/null Sat Oct 7 17:14:59 2017
+++ src/crypto/external/bsd/openssh/dist/recallocarray.c Sat Oct 7 17:14:59 2017
@@ -0,0 +1,51 @@
+/* $NetBSD: recallocarray.c,v 1.1 2017/10/07 21:14:59 christos Exp $ */
+/* $OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $ */
+
+/*-
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "includes.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: recallocarray.c,v 1.1 2017/10/07 21:14:59 christos Exp $");
+
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+void *
+recallocarray(void *optr, size_t omemb, size_t nmemb, size_t size)
+{
+ char *nptr = reallocarray(optr, nmemb, size);
+
+ if (nptr == NULL || omemb >= nmemb)
+ return nptr;
+
+ memset(nptr + omemb * size, 0, (nmemb - omemb) * size);
+ return nptr;
+}
