From owner-svn-src-projects@freebsd.org Wed Oct 3 16:38:37 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 128DC10A4DB2 for ; Wed, 3 Oct 2018 16:38:37 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B3C6584233; Wed, 3 Oct 2018 16:38:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABFA319797; Wed, 3 Oct 2018 16:38:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w93GcakI088502; Wed, 3 Oct 2018 16:38:36 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w93GcaOb088491; Wed, 3 Oct 2018 16:38:36 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810031638.w93GcaOb088491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 3 Oct 2018 16:38:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r339157 - in projects/openssl111: crypto/openssh secure/lib/libssh X-SVN-Group: projects X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in projects/openssl111: crypto/openssh secure/lib/libssh X-SVN-Commit-Revision: 339157 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2018 16:38:37 -0000 Author: emaste Date: Wed Oct 3 16:38:36 2018 New Revision: 339157 URL: https://svnweb.freebsd.org/changeset/base/339157 Log: openssh: connect libressl-api-compat.c and regen config.h Differential Revision: https://reviews.freebsd.org/D17390 Modified: projects/openssl111/crypto/openssh/config.h projects/openssl111/secure/lib/libssh/Makefile Modified: projects/openssl111/crypto/openssh/config.h ============================================================================== --- projects/openssl111/crypto/openssh/config.h Wed Oct 3 16:14:17 2018 (r339156) +++ projects/openssl111/crypto/openssh/config.h Wed Oct 3 16:38:36 2018 (r339157) @@ -394,6 +394,21 @@ /* Define if you have /dev/ptc */ /* #undef HAVE_DEV_PTS_AND_PTC */ +/* Define if libcrypto has DH_get0_key */ +#define HAVE_DH_GET0_KEY 1 + +/* Define if libcrypto has DH_get0_pqg */ +#define HAVE_DH_GET0_PQG 1 + +/* Define if libcrypto has DH_set0_key */ +#define HAVE_DH_SET0_KEY 1 + +/* Define if libcrypto has DH_set0_pqg */ +#define HAVE_DH_SET0_PQG 1 + +/* Define if libcrypto has DH_set_length */ +#define HAVE_DH_SET_LENGTH 1 + /* Define to 1 if you have the header file. */ #define HAVE_DIRENT_H 1 @@ -406,6 +421,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 */ +#define HAVE_DSA_GET0_KEY 1 + +/* Define if libcrypto has DSA_get0_pqg */ +#define HAVE_DSA_GET0_PQG 1 + +/* Define if libcrypto has DSA_set0_key */ +#define HAVE_DSA_SET0_KEY 1 + +/* Define if libcrypto has DSA_set0_pqg */ +#define HAVE_DSA_SET0_PQG 1 + +/* Define if libcrypto has DSA_SIG_get0 */ +#define HAVE_DSA_SIG_GET0 1 + +/* Define if libcrypto has DSA_SIG_set0 */ +#define HAVE_DSA_SIG_SET0 1 + +/* Define if libcrypto has ECDSA_SIG_get0 */ +#define HAVE_ECDSA_SIG_GET0 1 + +/* Define if libcrypto has ECDSA_SIG_set0 */ +#define HAVE_ECDSA_SIG_SET0 1 + /* Define to 1 if you have the header file. */ #define HAVE_ELF_H 1 @@ -436,6 +475,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 */ +#define HAVE_EVP_CIPHER_CTX_IV 1 + +/* Define if libcrypto has EVP_CIPHER_CTX_iv_noconst */ +#define HAVE_EVP_CIPHER_CTX_IV_NOCONST 1 + /* Define to 1 if you have the `EVP_DigestFinal_ex' function. */ #define HAVE_EVP_DIGESTFINAL_EX 1 @@ -443,14 +491,23 @@ #define HAVE_EVP_DIGESTINIT_EX 1 /* Define to 1 if you have the `EVP_MD_CTX_cleanup' function. */ -#define HAVE_EVP_MD_CTX_CLEANUP 1 +/* #undef HAVE_EVP_MD_CTX_CLEANUP */ /* 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 */ +#define HAVE_EVP_MD_CTX_FREE 1 + /* Define to 1 if you have the `EVP_MD_CTX_init' function. */ -#define HAVE_EVP_MD_CTX_INIT 1 +/* #undef HAVE_EVP_MD_CTX_INIT */ +/* Define if libcrypto has EVP_MD_CTX_new */ +#define HAVE_EVP_MD_CTX_NEW 1 + +/* Define if libcrypto has EVP_PKEY_get0_RSA */ +#define HAVE_EVP_PKEY_GET0_RSA 1 + /* Define to 1 if you have the `EVP_ripemd160' function. */ #define HAVE_EVP_RIPEMD160 1 @@ -647,7 +704,7 @@ #define HAVE_HEADER_AD 1 /* Define to 1 if you have the `HMAC_CTX_init' function. */ -#define HAVE_HMAC_CTX_INIT 1 +/* #undef HAVE_HMAC_CTX_INIT */ /* Define if you have ut_host in utmp.h */ /* #undef HAVE_HOST_IN_UTMP */ @@ -973,8 +1030,47 @@ /* 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 */ +#define HAVE_RSA_GET0_CRT_PARAMS 1 + +/* Define if libcrypto has RSA_get0_factors */ +#define HAVE_RSA_GET0_FACTORS 1 + +/* Define if libcrypto has RSA_get0_key */ +#define HAVE_RSA_GET0_KEY 1 + /* 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 */ +#define HAVE_RSA_METH_DUP 1 + +/* Define if libcrypto has RSA_meth_free */ +#define HAVE_RSA_METH_FREE 1 + +/* Define if libcrypto has RSA_meth_get_finish */ +#define HAVE_RSA_METH_GET_FINISH 1 + +/* Define if libcrypto has RSA_meth_set1_name */ +#define HAVE_RSA_METH_SET1_NAME 1 + +/* Define if libcrypto has RSA_meth_set_finish */ +#define HAVE_RSA_METH_SET_FINISH 1 + +/* Define if libcrypto has RSA_meth_set_priv_dec */ +#define HAVE_RSA_METH_SET_PRIV_DEC 1 + +/* Define if libcrypto has RSA_meth_set_priv_enc */ +#define HAVE_RSA_METH_SET_PRIV_ENC 1 + +/* Define if libcrypto has RSA_get0_srt_params */ +#define HAVE_RSA_SET0_CRT_PARAMS 1 + +/* Define if libcrypto has RSA_set0_factors */ +#define HAVE_RSA_SET0_FACTORS 1 + +/* Define if libcrypto has RSA_set0_key */ +#define HAVE_RSA_SET0_KEY 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_SANDBOX_H */ Modified: projects/openssl111/secure/lib/libssh/Makefile ============================================================================== --- projects/openssl111/secure/lib/libssh/Makefile Wed Oct 3 16:14:17 2018 (r339156) +++ projects/openssl111/secure/lib/libssh/Makefile Wed Oct 3 16:38:36 2018 (r339157) @@ -31,7 +31,9 @@ PACKAGE= ssh # Portability layer SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \ - fmt_scaled.c freezero.c glob.c openssl-compat.c port-net.c \ + fmt_scaled.c freezero.c glob.c \ + libressl-api-compat.c \ + openssl-compat.c port-net.c \ realpath.c recallocarray.c strtonum.c timingsafe_bcmp.c vis.c xcrypt.c .if ${MK_LDNS} == "no"