[Midnightbsd-cvs] src [12237] trunk/crypto/openssh: update build config
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 8 21:06:25 EDT 2019
Revision: 12237
http://svnweb.midnightbsd.org/src/?rev=12237
Author: laffer1
Date: 2019-08-08 21:06:25 -0400 (Thu, 08 Aug 2019)
Log Message:
-----------
update build config
Modified Paths:
--------------
trunk/crypto/openssh/config.h
trunk/crypto/openssh/openbsd-compat/openssl-compat.c
Modified: trunk/crypto/openssh/config.h
===================================================================
--- trunk/crypto/openssh/config.h 2019-08-09 01:06:10 UTC (rev 12236)
+++ trunk/crypto/openssh/config.h 2019-08-09 01:06:25 UTC (rev 12237)
@@ -1,6 +1,9 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
/* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address
*/
/* #undef AIX_GETNAMEINFO_HACK */
@@ -32,12 +35,6 @@
/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */
/* #undef BROKEN_INET_NTOA */
-/* ia_uinfo routines not supported by OS yet */
-/* #undef BROKEN_LIBIAF */
-
-/* Ultrix mmap can't map files */
-/* #undef BROKEN_MMAP */
-
/* Define if your struct dirent expects you to allocate extra space for d_name
*/
/* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */
@@ -76,7 +73,13 @@
/* Define if your snprintf is busted */
/* #undef BROKEN_SNPRINTF */
-/* missing VIS_ALL */
+/* strndup broken, see APAR IY61211 */
+/* #undef BROKEN_STRNDUP */
+
+/* strnlen broken, see APAR IY62551 */
+/* #undef BROKEN_STRNLEN */
+
+/* strnvis detected broken */
#define BROKEN_STRNVIS 1
/* tcgetattr with ICANON may hang */
@@ -89,7 +92,7 @@
/* #undef BSD_AUTH */
/* Define if you want to specify the path to your lastlog file */
-#define CONF_LASTLOG_FILE "/var/log/lastlog"
+/* #undef CONF_LASTLOG_FILE */
/* Define if you want to specify the path to your utmp file */
/* #undef CONF_UTMP_FILE */
@@ -98,7 +101,7 @@
/* #undef CONF_WTMPX_FILE */
/* Define if you want to specify the path to your wtmp file */
-#define CONF_WTMP_FILE "/var/log/wtmp"
+/* #undef CONF_WTMP_FILE */
/* Define if your platform needs to skip post auth file descriptor passing */
/* #undef DISABLE_FD_PASSING */
@@ -131,8 +134,11 @@
#define DISABLE_WTMPX 1
/* Enable for PKCS#11 support */
-#define ENABLE_PKCS11
+#define ENABLE_PKCS11 /**/
+/* define if fflush(NULL) does not work */
+/* #undef FFLUSH_NULL_BUG */
+
/* File names may not contain backslash characters */
/* #undef FILESYSTEM_NO_BACKSLASH */
@@ -142,7 +148,7 @@
/* fsid_t has member __val */
/* #undef FSID_HAS___VAL */
-/* Define to 1 if the `getpgrp' function requires zero arguments. */
+/* getpgrp takes one arg */
#define GETPGRP_VOID 1
/* Conflicting defs for getspnam */
@@ -253,8 +259,14 @@
/* Define to 1 if you have the <bstring.h> header file. */
/* #undef HAVE_BSTRING_H */
+/* Define to 1 if you have the `bzero' function. */
+#define HAVE_BZERO 1
+
+/* calloc(0, x) returns NULL */
+#define HAVE_CALLOC 1
+
/* Define to 1 if you have the `cap_rights_limit' function. */
-/* #undef HAVE_CAP_RIGHTS_LIMIT */
+#define HAVE_CAP_RIGHTS_LIMIT 1
/* Define to 1 if you have the `clock' function. */
#define HAVE_CLOCK 1
@@ -275,6 +287,7 @@
#define HAVE_CONTROL_IN_MSGHDR 1
/* Define to 1 if you have the `crypt' function. */
+/* #undef HAVE_CRYPT */
#define HAVE_CRYPT 1
/* Define to 1 if you have the <crypto/sha2.h> header file. */
@@ -297,6 +310,10 @@
don't. */
/* #undef HAVE_DECL_AUTHENTICATE */
+/* Define to 1 if you have the declaration of `bzero', and to 0 if you don't.
+ */
+#define HAVE_DECL_BZERO 1
+
/* Define to 1 if you have the declaration of `GLOB_NOMATCH', and to 0 if you
don't. */
#define HAVE_DECL_GLOB_NOMATCH 1
@@ -345,6 +362,10 @@
don't. */
/* #undef HAVE_DECL_PASSWDEXPIRED */
+/* Define to 1 if you have the declaration of `readv', and to 0 if you don't.
+ */
+#define HAVE_DECL_READV 1
+
/* Define to 1 if you have the declaration of `setauthdb', and to 0 if you
don't. */
/* #undef HAVE_DECL_SETAUTHDB */
@@ -369,16 +390,31 @@
#define HAVE_DES_CRYPT 1
/* Define if you have /dev/ptmx */
-#define HAVE_DEV_PTMX 1
+/* #undef HAVE_DEV_PTMX */
/* Define if you have /dev/ptc */
/* #undef HAVE_DEV_PTS_AND_PTC */
+/* Define if libcrypto has DH_get0_key */
+/* #undef HAVE_DH_GET0_KEY */
+
+/* Define if libcrypto has DH_get0_pqg */
+/* #undef HAVE_DH_GET0_PQG */
+
+/* Define if libcrypto has DH_set0_key */
+/* #undef HAVE_DH_SET0_KEY */
+
+/* Define if libcrypto has DH_set0_pqg */
+/* #undef HAVE_DH_SET0_PQG */
+
+/* Define if libcrypto has DH_set_length */
+/* #undef HAVE_DH_SET_LENGTH */
+
/* Define to 1 if you have the <dirent.h> header file. */
#define HAVE_DIRENT_H 1
/* Define to 1 if you have the `dirfd' function. */
-/* #undef HAVE_DIRFD */
+#define HAVE_DIRFD 1
/* Define to 1 if you have the `dirname' function. */
#define HAVE_DIRNAME 1
@@ -386,6 +422,30 @@
/* Define to 1 if you have the `DSA_generate_parameters_ex' function. */
#define HAVE_DSA_GENERATE_PARAMETERS_EX 1
+/* Define if libcrypto has DSA_get0_key */
+/* #undef HAVE_DSA_GET0_KEY */
+
+/* Define if libcrypto has DSA_get0_pqg */
+/* #undef HAVE_DSA_GET0_PQG */
+
+/* Define if libcrypto has DSA_set0_key */
+/* #undef HAVE_DSA_SET0_KEY */
+
+/* Define if libcrypto has DSA_set0_pqg */
+/* #undef HAVE_DSA_SET0_PQG */
+
+/* Define if libcrypto has DSA_SIG_get0 */
+/* #undef HAVE_DSA_SIG_GET0 */
+
+/* Define if libcrypto has DSA_SIG_set0 */
+/* #undef HAVE_DSA_SIG_SET0 */
+
+/* Define if libcrypto has ECDSA_SIG_get0 */
+/* #undef HAVE_ECDSA_SIG_GET0 */
+
+/* Define if libcrypto has ECDSA_SIG_set0 */
+/* #undef HAVE_ECDSA_SIG_SET0 */
+
/* Define to 1 if you have the <elf.h> header file. */
#define HAVE_ELF_H 1
@@ -416,6 +476,15 @@
/* Define if libcrypto has EVP_CIPHER_CTX_ctrl */
#define HAVE_EVP_CIPHER_CTX_CTRL 1
+/* Define if libcrypto has EVP_CIPHER_CTX_set_iv */
+/* #undef HAVE_EVP_CIPHER_CTX_GET_IV */
+
+/* Define if libcrypto has EVP_CIPHER_CTX_iv */
+/* #undef HAVE_EVP_CIPHER_CTX_IV */
+
+/* Define if libcrypto has EVP_CIPHER_CTX_iv_noconst */
+/* #undef HAVE_EVP_CIPHER_CTX_IV_NOCONST */
+
/* Define to 1 if you have the `EVP_DigestFinal_ex' function. */
#define HAVE_EVP_DIGESTFINAL_EX 1
@@ -428,9 +497,18 @@
/* Define to 1 if you have the `EVP_MD_CTX_copy_ex' function. */
#define HAVE_EVP_MD_CTX_COPY_EX 1
+/* Define if libcrypto has EVP_MD_CTX_free */
+/* #undef HAVE_EVP_MD_CTX_FREE */
+
/* Define to 1 if you have the `EVP_MD_CTX_init' function. */
#define HAVE_EVP_MD_CTX_INIT 1
+/* Define if libcrypto has EVP_MD_CTX_new */
+/* #undef HAVE_EVP_MD_CTX_NEW */
+
+/* Define if libcrypto has EVP_PKEY_get0_RSA */
+/* #undef HAVE_EVP_PKEY_GET0_RSA */
+
/* Define to 1 if you have the `EVP_ripemd160' function. */
#define HAVE_EVP_RIPEMD160 1
@@ -464,6 +542,9 @@
/* Define to 1 if you have the <floatingpoint.h> header file. */
#define HAVE_FLOATINGPOINT_H 1
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
/* Define to 1 if you have the `fmt_scaled' function. */
/* #undef HAVE_FMT_SCALED */
@@ -470,6 +551,9 @@
/* Define to 1 if you have the `freeaddrinfo' function. */
#define HAVE_FREEADDRINFO 1
+/* Define to 1 if you have the `freezero' function. */
+/* #undef HAVE_FREEZERO */
+
/* Define to 1 if the system has the type `fsblkcnt_t'. */
#define HAVE_FSBLKCNT_T 1
@@ -509,6 +593,9 @@
/* Define to 1 if you have the `getlastlogxbyname' function. */
/* #undef HAVE_GETLASTLOGXBYNAME */
+/* Define to 1 if you have the `getline' function. */
+#define HAVE_GETLINE 1
+
/* Define to 1 if you have the `getluid' function. */
/* #undef HAVE_GETLUID */
@@ -542,6 +629,9 @@
/* Define to 1 if you have the `getpwanam' function. */
/* #undef HAVE_GETPWANAM */
+/* Define to 1 if you have the `getrandom' function. */
+/* #undef HAVE_GETRANDOM */
+
/* Define to 1 if you have the `getrlimit' function. */
#define HAVE_GETRLIMIT 1
@@ -548,12 +638,12 @@
/* Define if getrrsetbyname() exists */
/* #undef HAVE_GETRRSETBYNAME */
-/* Define to 1 if you have the `getrusage' function. */
-/* #undef HAVE_GETRUSAGE */
-
/* Define to 1 if you have the `getseuserbyname' function. */
/* #undef HAVE_GETSEUSERBYNAME */
+/* Define to 1 if you have the `getsid' function. */
+#define HAVE_GETSID 1
+
/* Define to 1 if you have the `gettimeofday' function. */
#define HAVE_GETTIMEOFDAY 1
@@ -635,6 +725,9 @@
/* Define if you have ut_id in utmpx.h */
#define HAVE_ID_IN_UTMPX 1
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
/* Define to 1 if you have the `inet_aton' function. */
#define HAVE_INET_ATON 1
@@ -684,7 +777,7 @@
/* #undef HAVE_LASTLOG_H */
/* Define if you want ldns support */
-/* #undef HAVE_LDNS */
+#define HAVE_LDNS 1
/* Define to 1 if you have the <libaudit.h> header file. */
/* #undef HAVE_LIBAUDIT_H */
@@ -737,6 +830,9 @@
/* Define to 1 if you have the <linux/seccomp.h> header file. */
/* #undef HAVE_LINUX_SECCOMP_H */
+/* Define to 1 if you have the `llabs' function. */
+#define HAVE_LLABS 1
+
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
@@ -767,6 +863,10 @@
/* Define to 1 if you have the <maillock.h> header file. */
/* #undef HAVE_MAILLOCK_H */
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+ to 0 otherwise. */
+#define HAVE_MALLOC 1
+
/* Define to 1 if you have the `mblen' function. */
#define HAVE_MBLEN 1
@@ -777,7 +877,7 @@
/* #undef HAVE_MD5_CRYPT */
/* Define if you want to allow MD5 passwords */
-/* #undef HAVE_MD5_PASSWORDS */
+#define HAVE_MD5_PASSWORDS 1
/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
@@ -791,9 +891,6 @@
/* Define to 1 if you have the `mkdtemp' function. */
#define HAVE_MKDTEMP 1
-/* Define to 1 if you have the `mmap' function. */
-#define HAVE_MMAP 1
-
/* define if you have mode_t data type */
#define HAVE_MODE_T 1
@@ -812,6 +909,9 @@
/* Define to 1 if you have the <net/if_tun.h> header file. */
#define HAVE_NET_IF_TUN_H 1
+/* Define to 1 if you have the <net/route.h> header file. */
+#define HAVE_NET_ROUTE_H 1
+
/* Define if you are on NeXT */
/* #undef HAVE_NEXT */
@@ -894,6 +994,9 @@
/* Define to 1 if you have the `pututxline' function. */
#define HAVE_PUTUTXLINE 1
+/* Define to 1 if you have the `raise' function. */
+#define HAVE_RAISE 1
+
/* Define to 1 if you have the `readpassphrase' function. */
#define HAVE_READPASSPHRASE 1
@@ -900,6 +1003,10 @@
/* Define to 1 if you have the <readpassphrase.h> header file. */
#define HAVE_READPASSPHRASE_H 1
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+ and to 0 otherwise. */
+#define HAVE_REALLOC 1
+
/* Define to 1 if you have the `reallocarray' function. */
#define HAVE_REALLOCARRAY 1
@@ -906,11 +1013,14 @@
/* Define to 1 if you have the `realpath' function. */
#define HAVE_REALPATH 1
+/* Define to 1 if you have the `recallocarray' function. */
+/* #undef HAVE_RECALLOCARRAY */
+
/* Define to 1 if you have the `recvmsg' function. */
#define HAVE_RECVMSG 1
/* sys/resource.h has RLIMIT_NPROC */
-#define HAVE_RLIMIT_NPROC
+#define HAVE_RLIMIT_NPROC /**/
/* Define to 1 if you have the <rpc/types.h> header file. */
#define HAVE_RPC_TYPES_H 1
@@ -921,9 +1031,48 @@
/* Define to 1 if you have the `RSA_generate_key_ex' function. */
#define HAVE_RSA_GENERATE_KEY_EX 1
+/* Define if libcrypto has RSA_get0_crt_params */
+/* #undef HAVE_RSA_GET0_CRT_PARAMS */
+
+/* Define if libcrypto has RSA_get0_factors */
+/* #undef HAVE_RSA_GET0_FACTORS */
+
+/* Define if libcrypto has RSA_get0_key */
+/* #undef HAVE_RSA_GET0_KEY */
+
/* Define to 1 if you have the `RSA_get_default_method' function. */
#define HAVE_RSA_GET_DEFAULT_METHOD 1
+/* Define if libcrypto has RSA_meth_dup */
+/* #undef HAVE_RSA_METH_DUP */
+
+/* Define if libcrypto has RSA_meth_free */
+/* #undef HAVE_RSA_METH_FREE */
+
+/* Define if libcrypto has RSA_meth_get_finish */
+/* #undef HAVE_RSA_METH_GET_FINISH */
+
+/* Define if libcrypto has RSA_meth_set1_name */
+/* #undef HAVE_RSA_METH_SET1_NAME */
+
+/* Define if libcrypto has RSA_meth_set_finish */
+/* #undef HAVE_RSA_METH_SET_FINISH */
+
+/* Define if libcrypto has RSA_meth_set_priv_dec */
+/* #undef HAVE_RSA_METH_SET_PRIV_DEC */
+
+/* Define if libcrypto has RSA_meth_set_priv_enc */
+/* #undef HAVE_RSA_METH_SET_PRIV_ENC */
+
+/* Define if libcrypto has RSA_get0_srt_params */
+/* #undef HAVE_RSA_SET0_CRT_PARAMS */
+
+/* Define if libcrypto has RSA_set0_factors */
+/* #undef HAVE_RSA_SET0_FACTORS */
+
+/* Define if libcrypto has RSA_set0_key */
+/* #undef HAVE_RSA_SET0_KEY */
+
/* Define to 1 if you have the <sandbox.h> header file. */
/* #undef HAVE_SANDBOX_H */
@@ -1074,6 +1223,9 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
+/* Define to 1 if you have the `strcasestr' function. */
+#define HAVE_STRCASESTR 1
+
/* Define to 1 if you have the `strdup' function. */
#define HAVE_STRDUP 1
@@ -1101,6 +1253,9 @@
/* Define to 1 if you have the `strmode' function. */
#define HAVE_STRMODE 1
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
+
/* Define to 1 if you have the `strnlen' function. */
#define HAVE_STRNLEN 1
@@ -1113,6 +1268,9 @@
/* Define to 1 if you have the `strsep' function. */
#define HAVE_STRSEP 1
+/* Define to 1 if you have the `strsignal' function. */
+#define HAVE_STRSIGNAL 1
+
/* Define to 1 if you have the `strtoll' function. */
#define HAVE_STRTOLL 1
@@ -1131,30 +1289,39 @@
/* define if you have struct in6_addr data type */
#define HAVE_STRUCT_IN6_ADDR 1
-/* Define to 1 if `pw_change' is member of `struct passwd'. */
+/* Define to 1 if `pw_change' is a member of `struct passwd'. */
#define HAVE_STRUCT_PASSWD_PW_CHANGE 1
-/* Define to 1 if `pw_class' is member of `struct passwd'. */
+/* Define to 1 if `pw_class' is a member of `struct passwd'. */
#define HAVE_STRUCT_PASSWD_PW_CLASS 1
-/* Define to 1 if `pw_expire' is member of `struct passwd'. */
+/* Define to 1 if `pw_expire' is a member of `struct passwd'. */
#define HAVE_STRUCT_PASSWD_PW_EXPIRE 1
-/* Define to 1 if `pw_gecos' is member of `struct passwd'. */
+/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */
#define HAVE_STRUCT_PASSWD_PW_GECOS 1
/* define if you have struct sockaddr_in6 data type */
#define HAVE_STRUCT_SOCKADDR_IN6 1
-/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */
+/* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */
#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
/* define if you have struct sockaddr_storage data type */
#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `f_flags' is a member of `struct statfs'. */
+/* #undef HAVE_STRUCT_STATFS_F_FLAGS */
+
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+/* Define to 1 if `st_mtim' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_MTIM 1
+
+/* Define to 1 if `st_mtime' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_MTIME 1
+
/* Define to 1 if the system has the type `struct timespec'. */
#define HAVE_STRUCT_TIMESPEC 1
@@ -1179,8 +1346,8 @@
/* Define to 1 if you have the <sys/bsdtty.h> header file. */
/* #undef HAVE_SYS_BSDTTY_H */
-/* Define to 1 if you have the <sys/capability.h> header file. */
-#define HAVE_SYS_CAPABILITY_H 1
+/* Define to 1 if you have the <sys/capsicum.h> header file. */
+#define HAVE_SYS_CAPSICUM_H 1
/* Define to 1 if you have the <sys/cdefs.h> header file. */
#define HAVE_SYS_CDEFS_H 1
@@ -1191,6 +1358,12 @@
/* Define if your system defines sys_errlist[] */
#define HAVE_SYS_ERRLIST 1
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/label.h> header file. */
+/* #undef HAVE_SYS_LABEL_H */
+
/* Define to 1 if you have the <sys/mman.h> header file. */
#define HAVE_SYS_MMAN_H 1
@@ -1215,6 +1388,12 @@
/* Define to 1 if you have the <sys/ptms.h> header file. */
/* #undef HAVE_SYS_PTMS_H */
+/* Define to 1 if you have the <sys/ptrace.h> header file. */
+#define HAVE_SYS_PTRACE_H 1
+
+/* Define to 1 if you have the <sys/random.h> header file. */
+#define HAVE_SYS_RANDOM_H 1
+
/* Define to 1 if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1
@@ -1233,6 +1412,9 @@
/* Define to 1 if you have the <sys/strtio.h> header file. */
/* #undef HAVE_SYS_STRTIO_H */
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
/* Force use of sys/syslog.h on Ultrix */
/* #undef HAVE_SYS_SYSLOG_H */
@@ -1251,6 +1433,9 @@
/* Define to 1 if you have the <sys/un.h> header file. */
#define HAVE_SYS_UN_H 1
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+/* #undef HAVE_SYS_VFS_H */
+
/* Define to 1 if you have the `tcgetpgrp' function. */
#define HAVE_TCGETPGRP 1
@@ -1419,6 +1604,9 @@
/* Define this if you are using the Heimdal version of Kerberos V5 */
/* #undef HEIMDAL */
+/* Define if you want HPN support. */
+#define HPN_ENABLED 1
+
/* Define if you need to use IP address instead of hostname in $DISPLAY */
/* #undef IPADDR_IN_DISPLAY */
@@ -1434,6 +1622,9 @@
/* Define if pututxline updates lastlog too */
/* #undef LASTLOG_WRITE_PUTUTXLINE */
+/* Define if you want TCP Wrappers support */
+#define LIBWRAP 1
+
/* Define to whatever link() returns for "not supported" if it doesn't return
EOPNOTSUPP. */
/* #undef LINK_OPNOTSUPP_ERRNO */
@@ -1448,7 +1639,7 @@
/* #undef LLONG_MIN */
/* Account locked with pw(1) */
-#define LOCKED_PASSWD_PREFIX "*LOCKED*"
+/* #undef LOCKED_PASSWD_PREFIX */
/* String used in /etc/passwd to denote locked account */
/* #undef LOCKED_PASSWD_STRING */
@@ -1456,19 +1647,9 @@
/* String used in /etc/passwd to denote locked account */
/* #undef LOCKED_PASSWD_SUBSTR */
-/* Some versions of /bin/login need the TERM supplied on the commandline */
-/* #undef LOGIN_NEEDS_TERM */
-
/* Some systems need a utmpx entry for /bin/login to work */
/* #undef LOGIN_NEEDS_UTMPX */
-/* Define if your login program cannot handle end of options ("--") */
-/* #undef LOGIN_NO_ENDOPT */
-
-/* If your header files don't define LOGIN_PROGRAM, then use this (detected)
- from environment and PATH */
-#define LOGIN_PROGRAM_FALLBACK "/usr/bin/login"
-
/* Set this to your mail directory if you do not have _PATH_MAILDIR */
/* #undef MAIL_DIRECTORY */
@@ -1475,12 +1656,15 @@
/* Need setpgrp to acquire controlling tty */
/* #undef NEED_SETPGRP */
+/* Define if you want NONECIPHER support. */
+/* #undef NONE_CIPHER_ENABLED */
+
+/* compiler does not accept __attribute__ on prototype args */
+/* #undef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS */
+
/* compiler does not accept __attribute__ on return types */
/* #undef NO_ATTRIBUTE_ON_RETURN_TYPE */
-/* Define if you don't want to use lastlog in session.c */
-/* #undef NO_SSH_LASTLOG */
-
/* Define to disable UID restoration test */
/* #undef NO_UID_RESTORATION_TEST */
@@ -1526,6 +1710,9 @@
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "openssh"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
#define PACKAGE_VERSION "Portable"
@@ -1552,7 +1739,7 @@
/* #undef PTY_ZEROREAD */
/* Sandbox using capsicum */
-/* #undef SANDBOX_CAPSICUM */
+#define SANDBOX_CAPSICUM 1
/* Sandbox using Darwin sandbox_init(3) */
/* #undef SANDBOX_DARWIN */
@@ -1564,7 +1751,7 @@
/* #undef SANDBOX_PLEDGE */
/* Sandbox using setrlimit(2) */
-#define SANDBOX_RLIMIT 1
+/* #undef SANDBOX_RLIMIT */
/* Sandbox using seccomp filter */
/* #undef SANDBOX_SECCOMP_FILTER */
@@ -1573,7 +1760,7 @@
/* #undef SANDBOX_SKIP_RLIMIT_FSIZE */
/* define if setrlimit RLIMIT_NOFILE breaks things */
-#define SANDBOX_SKIP_RLIMIT_NOFILE 1
+/* #undef SANDBOX_SKIP_RLIMIT_NOFILE */
/* Sandbox using Solaris/Illumos privileges */
/* #undef SANDBOX_SOLARIS */
@@ -1599,12 +1786,6 @@
/* The size of `short int', as computed by sizeof. */
#define SIZEOF_SHORT_INT 2
-/* Define if you want S/Key support */
-/* #undef SKEY */
-
-/* Define if your skeychallenge() function takes 4 arguments (NetBSD) */
-/* #undef SKEYCHALLENGE_4ARG */
-
/* Define as const if snprintf() can declare const char *fmt */
#define SNPRINTF_CONST const
@@ -1615,6 +1796,9 @@
/* Define if sshd somehow reacquires a controlling TTY after setsid() */
/* #undef SSHD_ACQUIRES_CTTY */
+/* sshd PAM service name */
+/* #undef SSHD_PAM_SERVICE */
+
/* Define if pam_chauthtok wants real uid set to the unpriv'ed user */
/* #undef SSHPAM_CHAUTHTOK_NEEDS_RUID */
@@ -1654,6 +1838,9 @@
/* syslog_r function is safe to use in in a signal handler */
/* #undef SYSLOG_R_SAFE_IN_SIGHAND */
+/* Support routing domains using Linux VRF */
+/* #undef SYS_RDOMAIN_LINUX */
+
/* Support passwords > 8 chars */
/* #undef UNIXWARE_LONG_PASSWORDS */
@@ -1699,7 +1886,7 @@
/* Define if you want to enable AIX4's authenticate function */
/* #undef WITH_AIXAUTHENTICATE */
-/* Define if you have/want arrays (cluster-wide session managment, not C
+/* Define if you have/want arrays (cluster-wide session management, not C
arrays) */
/* #undef WITH_IRIX_ARRAY */
@@ -1718,16 +1905,26 @@
/* Define if you want SELinux support. */
/* #undef WITH_SELINUX */
-/* include SSH protocol version 1 support */
-/* #define WITH_SSH1 1 */
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
/* Define if xauth is found in your path */
-/* #undef XAUTH_PATH */
+/* #define XAUTH_PATH "/usr/local/bin/xauth" */
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
@@ -1746,6 +1943,9 @@
/* Define if we don't have struct __res_state in resolv.h */
/* #undef __res_state */
+/* Define to rpl_calloc if the replacement function should be used. */
+/* #undef calloc */
+
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
@@ -1752,5 +1952,11 @@
/* #undef inline */
#endif
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
+/* Define to rpl_realloc if the replacement function should be used. */
+/* #undef realloc */
+
/* type to use in place of socklen_t if not defined */
/* #undef socklen_t */
Modified: trunk/crypto/openssh/openbsd-compat/openssl-compat.c
===================================================================
--- trunk/crypto/openssh/openbsd-compat/openssl-compat.c 2019-08-09 01:06:10 UTC (rev 12236)
+++ trunk/crypto/openssh/openbsd-compat/openssl-compat.c 2019-08-09 01:06:25 UTC (rev 12237)
@@ -76,12 +76,7 @@
ENGINE_load_builtin_engines();
ENGINE_register_all_complete();
-#if OPENSSL_VERSION_NUMBER < 0x10001000L
OPENSSL_config(NULL);
-#else
- OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
- OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL);
-#endif
}
#endif
More information about the Midnightbsd-cvs
mailing list