You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/10/25 23:48:34 UTC

[1/3] git commit: ACCUMULO-1714 - adding necessary README section for crypto

Updated Branches:
  refs/heads/master c3ca9872a -> c7b810b55


ACCUMULO-1714 - adding necessary README section for crypto


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9f863209
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9f863209
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9f863209

Branch: refs/heads/master
Commit: 9f86320996b3a7c77f9c5cb263246f9fabe56b24
Parents: 839351c
Author: John Vines <jv...@gmail.com>
Authored: Fri Oct 25 17:41:43 2013 -0400
Committer: John Vines <jv...@gmail.com>
Committed: Fri Oct 25 17:41:43 2013 -0400

----------------------------------------------------------------------
 README | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f863209/README
----------------------------------------------------------------------
diff --git a/README b/README
index 2e05aec..4b29864 100644
--- a/README
+++ b/README
@@ -312,3 +312,31 @@ develop a good understanding of the property and consider creating a test to
 prove the increased performance.
 
 ******************************************************************************
+
+11. Export Control  
+
+This distribution includes cryptographic software. The country in which you 
+currently reside may have restrictions on the import, possession, use, and/or
+re-export to another country, of encryption software. BEFORE using any 
+encryption software, please check your country's laws, regulations and 
+policies concerning the import, possession, or use, and re-export of encryption
+software, to see if this is permitted. See <http://www.wassenaar.org/> for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and Security 
+(BIS), has classified this software as Export Commodity Control Number (ECCN) 
+5D002.C.1, which includes information security software using or performing 
+cryptographic functions with asymmetric algorithms. The form and manner of this
+Apache Software Foundation distribution makes it eligible for export under the 
+License Exception ENC Technology Software Unrestricted (TSU) exception (see the
+BIS Export Administration Regulations, Section 740.13) for both object code and
+source code.
+
+The following provides more details on the included cryptographic software: ...
+
+Apache Accumulo uses the built-in java cryptography libraries in it's RFile 
+encryption implementation. See 
+http://www.oracle.com/us/products/export/export-regulations-345813.html
+for more details for on Java's cryptography features.
+
+******************************************************************************


[2/3] git commit: Merge branch '1.5.1-SNAPSHOT'

Posted by vi...@apache.org.
Merge branch '1.5.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9d7a2727
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9d7a2727
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9d7a2727

Branch: refs/heads/master
Commit: 9d7a2727ee2e55f99c0f0f68d4088813cf000023
Parents: c3ca987 9f86320
Author: John Vines <jv...@gmail.com>
Authored: Fri Oct 25 17:45:02 2013 -0400
Committer: John Vines <jv...@gmail.com>
Committed: Fri Oct 25 17:45:02 2013 -0400

----------------------------------------------------------------------
 README | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d7a2727/README
----------------------------------------------------------------------


[3/3] git commit: ACCUMULO-1714 - Adding necessary crypto readme information to the README

Posted by vi...@apache.org.
ACCUMULO-1714 - Adding necessary crypto readme information to the README


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c7b810b5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c7b810b5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c7b810b5

Branch: refs/heads/master
Commit: c7b810b55b445267680566c96990b7c518a21162
Parents: 9d7a272
Author: John Vines <jv...@gmail.com>
Authored: Fri Oct 25 17:48:06 2013 -0400
Committer: John Vines <jv...@gmail.com>
Committed: Fri Oct 25 17:48:06 2013 -0400

----------------------------------------------------------------------
 README | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c7b810b5/README
----------------------------------------------------------------------
diff --git a/README b/README
index 8775437..5047bdb 100644
--- a/README
+++ b/README
@@ -383,6 +383,9 @@ The following provides more details on the included cryptographic software: ...
 Apache Accumulo uses the built-in java cryptography libraries in it's RFile 
 encryption implementation. See 
 http://www.oracle.com/us/products/export/export-regulations-345813.html
-for more details for on Java's cryptography features.
+for more details for on Java's cryptography features. Apache Accumulo also uses
+the bouncycastle library for some crypographic technology as well. See 
+http://www.bouncycastle.org/wiki/display/JA1/Frequently+Asked+Questions for
+more details on bouncycastle's cryptography features.
 
 ******************************************************************************