From owner-svn-src-head@freebsd.org Wed Jul 15 15:35:28 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3ED5F3694E8; Wed, 15 Jul 2020 15:35:28 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B6M0H6wFPz4S04; Wed, 15 Jul 2020 15:35:27 +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 2B3B6194AC; Wed, 15 Jul 2020 15:35:27 +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 06FFZQ15098039; Wed, 15 Jul 2020 15:35:26 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06FFZQLO098037; Wed, 15 Jul 2020 15:35:26 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202007151535.06FFZQLO098037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 15 Jul 2020 15:35:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363225 - head/crypto/openssh X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/crypto/openssh X-SVN-Commit-Revision: 363225 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jul 2020 15:35:28 -0000 Author: emaste Date: Wed Jul 15 15:35:26 2020 New Revision: 363225 URL: https://svnweb.freebsd.org/changeset/base/363225 Log: openssh: refer to OpenSSL not SSLeay This change was made upstream between 7.9p1 and 8.0p1. We've made local changes in the same places for handling the version_addendum; apply the SSLeay_version to OpenSSL_version change in advance of importing 8.0p1. Obtained from: OpenSSH-portable a65784c9f9c5 Sponsored by: The FreeBSD Foundation Modified: head/crypto/openssh/sshd.c head/crypto/openssh/version.h Modified: head/crypto/openssh/sshd.c ============================================================================== --- head/crypto/openssh/sshd.c Wed Jul 15 14:38:15 2020 (r363224) +++ head/crypto/openssh/sshd.c Wed Jul 15 15:35:26 2020 (r363225) @@ -1749,7 +1749,7 @@ main(int ac, char **av) debug("sshd version %s, %s", SSH_VERSION, #ifdef WITH_OPENSSL - SSLeay_version(SSLEAY_VERSION) + OpenSSL_version(SSLEAY_VERSION) #else "without OpenSSL" #endif Modified: head/crypto/openssh/version.h ============================================================================== --- head/crypto/openssh/version.h Wed Jul 15 14:38:15 2020 (r363224) +++ head/crypto/openssh/version.h Wed Jul 15 15:35:26 2020 (r363225) @@ -9,7 +9,7 @@ #define SSH_VERSION_FREEBSD "FreeBSD-20200214" #ifdef WITH_OPENSSL -#define OPENSSL_VERSION_STRING SSLeay_version(SSLEAY_VERSION) +#define OPENSSL_VERSION_STRING OpenSSL_version(SSLEAY_VERSION) #else #define OPENSSL_VERSION_STRING "without OpenSSL" #endif