Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3217511A03 for ; Thu, 3 Jul 2014 23:40:54 +0000 (UTC) Received: (qmail 65205 invoked by uid 500); 3 Jul 2014 23:40:54 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 65134 invoked by uid 500); 3 Jul 2014 23:40:53 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 65123 invoked by uid 99); 3 Jul 2014 23:40:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2014 23:40:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2014 23:40:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6AC43238890D for ; Thu, 3 Jul 2014 23:40:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1607768 - in /hadoop/common/branches/fs-encryption: BUILDING.txt hadoop-project-dist/pom.xml hadoop-project/pom.xml Date: Thu, 03 Jul 2014 23:40:32 -0000 To: common-commits@hadoop.apache.org From: cmccabe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140703234032.6AC43238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cmccabe Date: Thu Jul 3 23:40:31 2014 New Revision: 1607768 URL: http://svn.apache.org/r1607768 Log: HADOOP-10693. Implementation of AES-CTR CryptoCodec using JNI to OpenSSL (hitliuyi via cmccabe) Modified: hadoop/common/branches/fs-encryption/BUILDING.txt hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml hadoop/common/branches/fs-encryption/hadoop-project/pom.xml Modified: hadoop/common/branches/fs-encryption/BUILDING.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/BUILDING.txt?rev=1607768&r1=1607767&r2=1607768&view=diff ============================================================================== --- hadoop/common/branches/fs-encryption/BUILDING.txt (original) +++ hadoop/common/branches/fs-encryption/BUILDING.txt Thu Jul 3 23:40:31 2014 @@ -81,6 +81,27 @@ Maven build goals: the final tar file. This option requires that -Dsnappy.lib is also given, and it ignores the -Dsnappy.prefix option. + OpenSSL build options: + + OpenSSL includes a crypto library that can be utilized by the native code. + It is currently an optional component, meaning that Hadoop can be built with + or without this dependency. + + * Use -Drequire.openssl to fail the build if libcrypto.so is not found. + If this option is not specified and the openssl library is missing, + we silently build a version of libhadoop.so that cannot make use of + openssl. This option is recommended if you plan on making use of openssl + and want to get more repeatable builds. + * Use -Dopenssl.prefix to specify a nonstandard location for the libcrypto + header files and library files. You do not need this option if you have + installed openssl using a package manager. + * Use -Dopenssl.lib to specify a nonstandard location for the libcrypto library + files. Similarly to openssl.prefix, you do not need this option if you have + installed openssl using a package manager. + * Use -Dbundle.openssl to copy the contents of the openssl.lib directory into + the final tar file. This option requires that -Dopenssl.lib is also given, + and it ignores the -Dopenssl.prefix option. + Tests options: * Use -DskipTests to skip tests when running the following Maven goals: Modified: hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml?rev=1607768&r1=1607767&r2=1607768&view=diff ============================================================================== --- hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml (original) +++ hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml Thu Jul 3 23:40:31 2014 @@ -41,6 +41,8 @@ UNDEF false false + false + false @@ -349,6 +351,10 @@ cd "${snappy.lib}" $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR) fi + if [ "${bundle.openssl}" = "true" ] ; then + cd "${openssl.lib}" + $$TAR *crypto* | (cd $${TARGET_DIR}/; $$UNTAR) + fi fi BIN_DIR="${BUILD_DIR}/bin" if [ -d $${BIN_DIR} ] ; then @@ -362,6 +368,12 @@ $$TAR *snappy* | (cd $${TARGET_BIN_DIR}/; $$UNTAR) fi fi + if [ "${bundle.openssl.in.bin}" = "true" ] ; then + if [ "${bundle.openssl}" = "true" ] ; then + cd "${openssl.lib}" + $$TAR *crypto* | (cd $${TARGET_BIN_DIR}/; $$UNTAR) + fi + fi fi Modified: hadoop/common/branches/fs-encryption/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project/pom.xml?rev=1607768&r1=1607767&r2=1607768&view=diff ============================================================================== --- hadoop/common/branches/fs-encryption/hadoop-project/pom.xml (original) +++ hadoop/common/branches/fs-encryption/hadoop-project/pom.xml Thu Jul 3 23:40:31 2014 @@ -1031,6 +1031,7 @@ file:/dev/urandom true + true @@ -1041,6 +1042,7 @@ ${env.PATH};${hadoop.common.build.dir}/bin;${snappy.lib} + ${env.PATH};${hadoop.common.build.dir}/bin;${openssl.lib}