Module Name: src
Committed By: christos
Date: Fri Sep 3 10:30:33 UTC 2021
Modified Files:
src/crypto/external/bsd/openssh/dist: cipher-chachapoly-libcrypto.c
includes.h kexsntrup761x25519.c namespace.h sntrup761.c
Log Message:
add some more functions to namespace.h; add missing RCSIDs
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c \
src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c \
src/crypto/external/bsd/openssh/dist/sntrup761.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/includes.h
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/namespace.h
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/cipher-chachapoly-libcrypto.c
diff -u src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c:1.1.1.1 src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c:1.2
--- src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c:1.1.1.1 Thu May 28 13:02:59 2020
+++ src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c Fri Sep 3 06:30:33 2021
@@ -1,3 +1,4 @@
+/* $NetBSD: cipher-chachapoly-libcrypto.c,v 1.2 2021/09/03 10:30:33 christos Exp $ */
/*
* Copyright (c) 2013 Damien Miller <[email protected]>
*
@@ -15,6 +16,8 @@
*/
/* $OpenBSD: cipher-chachapoly-libcrypto.c,v 1.1 2020/04/03 04:32:21 djm Exp $ */
+#include "includes.h"
+__RCSID("$NetBSD: cipher-chachapoly-libcrypto.c,v 1.2 2021/09/03 10:30:33 christos Exp $");
#include <sys/types.h>
#include <stdarg.h> /* needed for log.h */
Index: src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c
diff -u src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c:1.1.1.1 src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c:1.2
--- src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c:1.1.1.1 Fri Mar 5 12:45:25 2021
+++ src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c Fri Sep 3 06:30:33 2021
@@ -1,3 +1,4 @@
+/* $NetBSD: kexsntrup761x25519.c,v 1.2 2021/09/03 10:30:33 christos Exp $ */
/* $OpenBSD: kexsntrup761x25519.c,v 1.1 2020/12/29 00:59:15 djm Exp $ */
/*
* Copyright (c) 2019 Markus Friedl. All rights reserved.
@@ -23,6 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "includes.h"
+__RCSID("$NetBSD: kexsntrup761x25519.c,v 1.2 2021/09/03 10:30:33 christos Exp $");
+
#include <sys/types.h>
#include <stdio.h>
Index: src/crypto/external/bsd/openssh/dist/sntrup761.c
diff -u src/crypto/external/bsd/openssh/dist/sntrup761.c:1.1.1.1 src/crypto/external/bsd/openssh/dist/sntrup761.c:1.2
--- src/crypto/external/bsd/openssh/dist/sntrup761.c:1.1.1.1 Fri Mar 5 12:45:26 2021
+++ src/crypto/external/bsd/openssh/dist/sntrup761.c Fri Sep 3 06:30:33 2021
@@ -1,3 +1,4 @@
+/* $NetBSD: sntrup761.c,v 1.2 2021/09/03 10:30:33 christos Exp $ */
/* $OpenBSD: sntrup761.c,v 1.5 2021/01/08 02:33:13 dtucker Exp $ */
/*
@@ -7,6 +8,8 @@
* - Tanja Lange
* - Christine van Vredendaal
*/
+#include "includes.h"
+__RCSID("$NetBSD: sntrup761.c,v 1.2 2021/09/03 10:30:33 christos Exp $");
#include <string.h>
#include "crypto_api.h"
Index: src/crypto/external/bsd/openssh/dist/includes.h
diff -u src/crypto/external/bsd/openssh/dist/includes.h:1.8 src/crypto/external/bsd/openssh/dist/includes.h:1.9
--- src/crypto/external/bsd/openssh/dist/includes.h:1.8 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/includes.h Fri Sep 3 06:30:33 2021
@@ -1,13 +1,14 @@
-/* $NetBSD: includes.h,v 1.8 2018/04/06 18:59:00 christos Exp $ */
+/* $NetBSD: includes.h,v 1.9 2021/09/03 10:30:33 christos Exp $ */
#include <sys/cdefs.h>
#ifndef __OpenBSD__
#define __bounded__(a, b, c)
#include <sys/types.h>
+
+#include "namespace.h"
+
void freezero(void *, size_t);
#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/dist/namespace.h
diff -u src/crypto/external/bsd/openssh/dist/namespace.h:1.9 src/crypto/external/bsd/openssh/dist/namespace.h:1.10
--- src/crypto/external/bsd/openssh/dist/namespace.h:1.9 Fri Mar 5 12:47:16 2021
+++ src/crypto/external/bsd/openssh/dist/namespace.h Fri Sep 3 06:30:33 2021
@@ -1,27 +1,98 @@
-/* $NetBSD: namespace.h,v 1.9 2021/03/05 17:47:16 christos Exp $ */
+/* $NetBSD: namespace.h,v 1.10 2021/09/03 10:30:33 christos Exp $ */
#ifndef _SSH_NAMESPACE_H_
-#define _SSH_NAMESPACE_H_
-#define addargs ssh_addargs
-#define atomicio ssh_atomicio
-#define chop ssh_chop
-#define colon ssh_colon
-#define convtime ssh_convtime
-#define do_log ssh_do_log
-#define freeargs ssh_freeargs
-#define freerrset ssh_freerrset
-#define hpdelim ssh_hpdelim
-#define getpass ssh_getpass
-#define getpeereid ssh_getpeereid
-#define getrrsetbyname ssh_getrrsetbyname
-#define pwcopy ssh_pwcopy
-#define replacearg ssh_replacearg
-#define strdelim ssh_strdelim
-#define tohex ssh_tohex
-#define uudecode ssh_uudecode
-#define uuencode ssh_uuencode
-#define xmalloc ssh_malloc
-#define xrealloc ssh_realloc
-#define xstrdup ssh_strdup
-#define xcalloc ssh_calloc
-#define xasprintf ssh_asprintf
+#define _SSH_NAMESPACE_H_
+#define add_host_to_hostfile ssh_add_host_to_hostfile
+#define addargs ssh_addargs
+#define addr_cmp ssh_addr_cmp
+#define addr_is_all0s ssh_addr_is_all0s
+#define addr_match_cidr_list ssh_addr_match_cidr_list
+#define addr_match_list ssh_addr_match_list
+#define addr_to_byte ssh_addr_to_byte
+#define asmprintf ssh_asmprintf
+#define atomicio ssh_atomicio
+#define atomicio6 ssh_atomicio6
+#define bandwidth_limit_init ssh_bandwidth_limit_init
+#define bcrypt_pbkdf ssh_bcrypt_pbkdf
+#define chop ssh_chop
+#define cleanup_exit ssh_cleanup_exit
+#define colon ssh_colon
+#define compat_cipher_proposal ssh_compat_cipher_proposal
+#define convtime ssh_convtime
+#define core_hash_SHA2 ssh_core_hash_SHA2
+#define daemonized ssh_daemonized
+#define dh_gen_key ssh_dh_gen_key
+#define dh_new_group_fallback ssh_dh_new_group_fallback
+#define dh_set_moduli_file ssh_dh_set_moduli_file
+#define do_log ssh_do_log
+#define dollar_expand ssh_dollar_expand
+#define exited_cleanly ssh_exited_cleanly
+#define fmprintf ssh_fmprintf
+#define fmt_scaled ssh_fmt_scaled
+#define fmt_timeframe ssh_fmt_timeframe
+#define format_absolute_time ssh_format_absolute_time
+#define forward_equals ssh_forward_equals
+#define free_hostkeys ssh_free_hostkeys
+#define freeargs ssh_freeargs
+#define freerrset ssh_freerrset
+#define freezero ssh_freezero
+#define get_sock_af ssh_get_sock_af
+#define getpass ssh_getpass
+#define getpeereid ssh_getpeereid
+#define getrrsetbyname ssh_getrrsetbyname
+#define hash_f ssh_hash_f
+#define hash_h ssh_hash_h
+#define hexdump ssh_hexdump
+#define host_hash ssh_host_hash
+#define hostfile_read_key ssh_hostfile_read_key
+#define hostfile_replace_entries ssh_hostfile_replace_entries
+#define hostkeys_foreach ssh_hostkeys_foreach
+#define hostkeys_foreach_file ssh_hostkeys_foreach_file
+#define hpdelim ssh_hpdelim
+#define load_hostkeys_file ssh_load_hostkeys_file
+#define match_filter_allowlist ssh_match_filter_allowlist
+#define match_filter_denylist ssh_match_filter_denylist
+#define mm_receive_fd ssh_mm_receive_fd
+#define mm_send_fd ssh_mm_send_fd
+#define monotime ssh_monotime
+#define mprintf ssh_mprintf
+#define ms_subtract_diff ssh_ms_subtract_diff
+#define notify_complete ssh_notify_complete
+#define notify_start ssh_notify_start
+#define opt_array_append ssh_opt_array_append
+#define opt_dequote ssh_opt_dequote
+#define opt_flag ssh_opt_flag
+#define parse_uri ssh_parse_uri
+#define percent_dollar_expand ssh_percent_dollar_expand
+#define prf ssh_prf
+#define put_u16 ssh_put_u16
+#define put_u32 ssh_put_u32
+#define put_u32_le ssh_put_u32_le
+#define pwcopy ssh_pwcopy
+#define refresh_progress_meter ssh_refresh_progress_meter
+#define replacearg ssh_replacearg
+#define safe_path ssh_safe_path
+#define safe_path_fd ssh_safe_path_fd
+#define sanitise_stdfd ssh_sanitise_stdfd
+#define set_sock_tos ssh_set_sock_tos
+#define snmprintf ssh_snmprintf
+#define stdfd_devnull ssh_stdfd_devnull
+#define strdelim ssh_strdelim
+#define tilde_expand ssh_tilde_expand
+#define tilde_expand_filename ssh_tilde_expand_filename
+#define tohex ssh_tohex
+#define uudecode ssh_uudecode
+#define uuencode ssh_uuencode
+#define vasnmprintf ssh_vasnmprintf
+#define vfmprintf ssh_vfmprintf
+#define waitrfd ssh_waitrfd
+#define wots_pkFromSig ssh_wots_pkFromSig
+#define xasprintf ssh_asprintf
+#define xcalloc ssh_calloc
+#define xextendf ssh_xextendf
+#define xmalloc ssh_malloc
+#define xrealloc ssh_realloc
+#define xreallocarray ssh_xreallocarray
+#define xrecallocarray ssh_xrecallocarray
+#define xstrdup ssh_strdup
+#define xvasprintf ssh_xvasprintf
#endif /* _SSH_NAMESPACE_H_ */
