From owner-svn-ports-all@FreeBSD.ORG Sun Jan 11 14:53:05 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95EA2264; Sun, 11 Jan 2015 14:53:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6687BB74; Sun, 11 Jan 2015 14:53:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0BEr5N8068818; Sun, 11 Jan 2015 14:53:05 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0BEr4B9068815; Sun, 11 Jan 2015 14:53:04 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201501111453.t0BEr4B9068815@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 11 Jan 2015 14:53:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376788 - in head/www/webstone-ssl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2015 14:53:05 -0000 Author: tijl Date: Sun Jan 11 14:53:04 2015 New Revision: 376788 URL: https://svnweb.freebsd.org/changeset/ports/376788 QAT: https://qat.redports.org/buildarchive/r376788/ Log: - Fix build when OpenSSL doesn't support SSL2/SSL3 - Negotiate the highest available SSL/TLS version by default using SSLv23_client_method PR: 195796 Added: head/www/webstone-ssl/files/patch-get.c (contents, props changed) Modified: head/www/webstone-ssl/Makefile Modified: head/www/webstone-ssl/Makefile ============================================================================== --- head/www/webstone-ssl/Makefile Sun Jan 11 14:46:44 2015 (r376787) +++ head/www/webstone-ssl/Makefile Sun Jan 11 14:53:04 2015 (r376788) @@ -3,6 +3,7 @@ PORTNAME= webstone PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= www benchmarks MASTER_SITES= http://crypto.stanford.edu/~nagendra/projects/WebStone/download/ PKGNAMESUFFIX= -ssl Added: head/www/webstone-ssl/files/patch-get.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webstone-ssl/files/patch-get.c Sun Jan 11 14:53:04 2015 (r376788) @@ -0,0 +1,45 @@ +--- get.c.orig 2000-06-21 19:15:41 UTC ++++ get.c +@@ -169,27 +169,33 @@ get(char *loc, NETPORT port, char *url, + OpenSSL_add_all_algorithms(); + OpenSSL_add_ssl_algorithms(); + +- if(ssl_version != NULL && strcasecmp(ssl_version, "SSLv23") == 0) { +- if((ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) { +- ERR_print_errors_fp(stderr); +- goto error; +- } +- D_PRINTF( "SSL version = SSLv23\n" ); +- } +- else if(ssl_version != NULL && strcasecmp(ssl_version, "SSLv2") == 0) { ++#ifndef OPENSSL_NO_SSL2 ++ if(ssl_version != NULL && strcasecmp(ssl_version, "SSLv2") == 0) { + if((ctx = SSL_CTX_new(SSLv2_client_method())) == NULL) { + ERR_print_errors_fp(stderr); + goto error; + } + D_PRINTF( "SSL version = SSLv2\n" ); + } +- else { ++ else ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++ if(ssl_version != NULL && strcasecmp(ssl_version, "SSLv3") == 0) { + if((ctx = SSL_CTX_new(SSLv3_client_method())) == NULL) { + ERR_print_errors_fp(stderr); + goto error; + } + D_PRINTF( "SSL version = SSLv3\n" ); + } ++ else ++#endif ++ { ++ if((ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) { ++ ERR_print_errors_fp(stderr); ++ goto error; ++ } ++ D_PRINTF( "SSL version = SSLv23\n" ); ++ } + + /* set preferred cipher */ + if(ssl_cipher != NULL && strlen(ssl_cipher) > 0) {