mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-23 20:31:13 +01:00
87c1498d1a
Release notes are available at https://www.openssh.com/txt/release-9.0 Some highlights: * ssh(1), sshd(8): use the hybrid Streamlined NTRU Prime + x25519 key exchange method by default ("sntrup761x25519-sha512@openssh.com"). The NTRU algorithm is believed to resist attacks enabled by future quantum computers and is paired with the X25519 ECDH key exchange (the previous default) as a backstop against any weaknesses in NTRU Prime that may be discovered in the future. The combination ensures that the hybrid exchange offers at least as good security as the status quo. * sftp-server(8): support the "copy-data" extension to allow server- side copying of files/data, following the design in draft-ietf-secsh-filexfer-extensions-00. bz2948 * sftp(1): add a "cp" command to allow the sftp client to perform server-side file copies. This commit excludes the scp(1) change to use the SFTP protocol by default; that change will immediately follow. MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation
119 lines
2.5 KiB
C
119 lines
2.5 KiB
C
/* $OpenBSD: xmalloc.c,v 1.37 2022/03/13 23:27:54 cheloha Exp $ */
|
|
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
* Versions of malloc and friends that check their results, and never return
|
|
* failure (they call fatal if they encounter an error).
|
|
*
|
|
* As far as I am concerned, the code I have written for this software
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
* software must be clearly marked as such, and if the derived work is
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
#include <stdarg.h>
|
|
#ifdef HAVE_STDINT_H
|
|
# include <stdint.h>
|
|
#endif
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "xmalloc.h"
|
|
#include "log.h"
|
|
|
|
#if defined(__OpenBSD__)
|
|
char *malloc_options = "S";
|
|
#endif /* __OpenBSD__ */
|
|
|
|
void *
|
|
xmalloc(size_t size)
|
|
{
|
|
void *ptr;
|
|
|
|
if (size == 0)
|
|
fatal("xmalloc: zero size");
|
|
ptr = malloc(size);
|
|
if (ptr == NULL)
|
|
fatal("xmalloc: out of memory (allocating %zu bytes)", size);
|
|
return ptr;
|
|
}
|
|
|
|
void *
|
|
xcalloc(size_t nmemb, size_t size)
|
|
{
|
|
void *ptr;
|
|
|
|
if (size == 0 || nmemb == 0)
|
|
fatal("xcalloc: zero size");
|
|
if (SIZE_MAX / nmemb < size)
|
|
fatal("xcalloc: nmemb * size > SIZE_MAX");
|
|
ptr = calloc(nmemb, size);
|
|
if (ptr == NULL)
|
|
fatal("xcalloc: out of memory (allocating %zu bytes)",
|
|
size * nmemb);
|
|
return ptr;
|
|
}
|
|
|
|
void *
|
|
xreallocarray(void *ptr, size_t nmemb, size_t size)
|
|
{
|
|
void *new_ptr;
|
|
|
|
new_ptr = reallocarray(ptr, nmemb, size);
|
|
if (new_ptr == NULL)
|
|
fatal("xreallocarray: out of memory (%zu elements of %zu bytes)",
|
|
nmemb, size);
|
|
return new_ptr;
|
|
}
|
|
|
|
void *
|
|
xrecallocarray(void *ptr, size_t onmemb, size_t nmemb, size_t size)
|
|
{
|
|
void *new_ptr;
|
|
|
|
new_ptr = recallocarray(ptr, onmemb, nmemb, size);
|
|
if (new_ptr == NULL)
|
|
fatal("xrecallocarray: out of memory (%zu elements of %zu bytes)",
|
|
nmemb, size);
|
|
return new_ptr;
|
|
}
|
|
|
|
char *
|
|
xstrdup(const char *str)
|
|
{
|
|
size_t len;
|
|
char *cp;
|
|
|
|
len = strlen(str) + 1;
|
|
cp = xmalloc(len);
|
|
return memcpy(cp, str, len);
|
|
}
|
|
|
|
int
|
|
xvasprintf(char **ret, const char *fmt, va_list ap)
|
|
{
|
|
int i;
|
|
|
|
i = vasprintf(ret, fmt, ap);
|
|
if (i < 0 || *ret == NULL)
|
|
fatal("xvasprintf: could not allocate memory");
|
|
return i;
|
|
}
|
|
|
|
int
|
|
xasprintf(char **ret, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
int i;
|
|
|
|
va_start(ap, fmt);
|
|
i = xvasprintf(ret, fmt, ap);
|
|
va_end(ap);
|
|
return i;
|
|
}
|