Some notable changes, from upstream's release notes: - sshd(8): Remove support for obsolete "host/port" syntax. - ssh(1): When prompting whether to record a new host key, accept the key fingerprint as a synonym for "yes". - ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" (RSA/SHA1) algorithm from those accepted for certificate signatures. - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F support to provide address-space isolation for token middleware libraries (including the internal one). - ssh(1): this release enables UpdateHostkeys by default subject to some conservative preconditions. - scp(1): this release changes the behaviour of remote to remote copies (e.g. "scp host-a:/path host-b:") to transfer through the local host by default. - scp(1): experimental support for transfers using the SFTP protocol as a replacement for the venerable SCP/RCP protocol that it has traditionally used. Additional integration work is needed to support FIDO/U2F in the base system. Deprecation Notice ------------------ OpenSSH will disable the ssh-rsa signature scheme by default in the next release. Reviewed by: imp MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29985
120 lines
2.5 KiB
C
120 lines
2.5 KiB
C
/* $OpenBSD: xmalloc.c,v 1.36 2019/11/12 22:32:48 djm 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);
|
|
strlcpy(cp, str, len);
|
|
return cp;
|
|
}
|
|
|
|
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;
|
|
}
|