Sat Oct 7 21:14:59 2017 UTC ()
define recallocarray locally.
(christos)
diff -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/includes.h
diff -r0 -r1.1 src/crypto/external/bsd/openssh/dist/recallocarray.c
diff -r1.22 -r1.23 src/crypto/external/bsd/openssh/lib/Makefile
--- src/crypto/external/bsd/openssh/dist/includes.h 2017/04/18 18:41:46 1.6
+++ src/crypto/external/bsd/openssh/dist/includes.h 2017/10/07 21:14:59 1.7
| @@ -1,9 +1,11 @@ | | | @@ -1,9 +1,11 @@ |
1 | /* $NetBSD: includes.h,v 1.6 2017/04/18 18:41:46 christos Exp $ */ | | 1 | /* $NetBSD: includes.h,v 1.7 2017/10/07 21:14:59 christos Exp $ */ |
2 | #include <sys/cdefs.h> | | 2 | #include <sys/cdefs.h> |
3 | #ifndef __OpenBSD__ | | 3 | #ifndef __OpenBSD__ |
4 | #define __bounded__(a, b, c) | | 4 | #define __bounded__(a, b, c) |
5 | #define explicit_bzero(a, b) explicit_memset((a), 0, (b)) | | 5 | #define explicit_bzero(a, b) explicit_memset((a), 0, (b)) |
6 | #define timingsafe_bcmp(a, b, c) (!consttime_memequal((a), (b), (c))) | | 6 | #define timingsafe_bcmp(a, b, c) (!consttime_memequal((a), (b), (c))) |
| | | 7 | #include <sys/types.h> |
| | | 8 | void *recallocarray(void *, size_t, size_t, size_t); |
7 | #endif | | 9 | #endif |
8 | | | 10 | |
9 | #include "namespace.h" | | 11 | #include "namespace.h" |
/* $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;
}
--- src/crypto/external/bsd/openssh/lib/Makefile 2017/10/07 19:39:19 1.22
+++ src/crypto/external/bsd/openssh/lib/Makefile 2017/10/07 21:14:59 1.23
| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: Makefile,v 1.22 2017/10/07 19:39:19 christos Exp $ | | 1 | # $NetBSD: Makefile,v 1.23 2017/10/07 21:14:59 christos Exp $ |
2 | | | 2 | |
3 | .include <bsd.own.mk> | | 3 | .include <bsd.own.mk> |
4 | | | 4 | |
5 | .include "../Makefile.inc" | | 5 | .include "../Makefile.inc" |
6 | | | 6 | |
7 | LIB= ssh | | 7 | LIB= ssh |
8 | SRCS=\ | | 8 | SRCS=\ |
9 | addrmatch.c \ | | 9 | addrmatch.c \ |
10 | atomicio.c \ | | 10 | atomicio.c \ |
11 | authfd.c \ | | 11 | authfd.c \ |
12 | authfile.c \ | | 12 | authfile.c \ |
13 | bcrypt_pbkdf.c \ | | 13 | bcrypt_pbkdf.c \ |
14 | bitmap.c \ | | 14 | bitmap.c \ |
| @@ -47,26 +47,27 @@ key.c \ | | | @@ -47,26 +47,27 @@ key.c \ |
47 | krl.c \ | | 47 | krl.c \ |
48 | log.c \ | | 48 | log.c \ |
49 | mac.c \ | | 49 | mac.c \ |
50 | match.c \ | | 50 | match.c \ |
51 | misc.c \ | | 51 | misc.c \ |
52 | monitor_fdpass.c \ | | 52 | monitor_fdpass.c \ |
53 | msg.c \ | | 53 | msg.c \ |
54 | nchan.c \ | | 54 | nchan.c \ |
55 | opacket.c \ | | 55 | opacket.c \ |
56 | packet.c \ | | 56 | packet.c \ |
57 | poly1305.c \ | | 57 | poly1305.c \ |
58 | progressmeter.c \ | | 58 | progressmeter.c \ |
59 | readpass.c \ | | 59 | readpass.c \ |
| | | 60 | recallocarray.c \ |
60 | sc25519.c \ | | 61 | sc25519.c \ |
61 | smult_curve25519_ref.c \ | | 62 | smult_curve25519_ref.c \ |
62 | sshbuf-getput-basic.c \ | | 63 | sshbuf-getput-basic.c \ |
63 | sshbuf-misc.c \ | | 64 | sshbuf-misc.c \ |
64 | sshbuf-getput-crypto.c \ | | 65 | sshbuf-getput-crypto.c \ |
65 | sshbuf.c \ | | 66 | sshbuf.c \ |
66 | ssherr.c \ | | 67 | ssherr.c \ |
67 | sshkey.c \ | | 68 | sshkey.c \ |
68 | ssh-ed25519.c \ | | 69 | ssh-ed25519.c \ |
69 | ssh-pkcs11.c \ | | 70 | ssh-pkcs11.c \ |
70 | ttymodes.c \ | | 71 | ttymodes.c \ |
71 | uidswap.c \ | | 72 | uidswap.c \ |
72 | umac.c \ | | 73 | umac.c \ |