You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/06/30 16:56:59 UTC
commons-crypto git commit: The OpenSSL library uses specific
(non-camel) casing
Repository: commons-crypto
Updated Branches:
refs/heads/master 4a19325fd -> af77e868e
The OpenSSL library uses specific (non-camel) casing
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/af77e868
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/af77e868
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/af77e868
Branch: refs/heads/master
Commit: af77e868e81ab01b0cb0c8782219e5040ec13798
Parents: 4a19325
Author: Sebb <se...@apache.org>
Authored: Thu Jun 30 17:56:55 2016 +0100
Committer: Sebb <se...@apache.org>
Committed: Thu Jun 30 17:56:55 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/crypto/conf/ConfigurationKeys.java | 4 ++--
.../java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java | 2 +-
.../org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java | 4 ++--
.../org/apache/commons/crypto/random/OpenSslCryptoRandom.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af77e868/src/main/java/org/apache/commons/crypto/conf/ConfigurationKeys.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/conf/ConfigurationKeys.java b/src/main/java/org/apache/commons/crypto/conf/ConfigurationKeys.java
index d5c19a4..7eddf20 100644
--- a/src/main/java/org/apache/commons/crypto/conf/ConfigurationKeys.java
+++ b/src/main/java/org/apache/commons/crypto/conf/ConfigurationKeys.java
@@ -40,7 +40,7 @@ public class ConfigurationKeys {
* "org.apache.commons.crypto.cipher.OpenSslCipher". Or it can be a comma
* separated list. The "org.apache.commons.crypto.cipher.JceCipher" use jce
* provider to implement CryptoCipher and the
- * "org.apache.commons.crypto.cipher.OpenSslCipher" use jni into openssl to
+ * "org.apache.commons.crypto.cipher.OpenSslCipher" use jni into OpenSSL to
* implement. Note that for each value,the first value which can be created
* without exception will be used (priority by order).
*/
@@ -85,7 +85,7 @@ public class ConfigurationKeys {
* "org.apache.commons.crypto.random.JavaCryptoRandom" use java to implement
* {@link org.apache.commons.crypto.random.CryptoRandom} and the
* "org.apache.commons.crypto.random.OpenSslCryptoRandom" use jni into
- * openssl to implement. Note that for each value,the first value which can
+ * OpenSSL to implement. Note that for each value,the first value which can
* be created without exception will be used (priority by order).
*/
public static final String SECURE_RANDOM_CLASSES_KEY = CONF_PREFIX
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af77e868/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java
index 7b0b978..75296b1 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java
@@ -247,7 +247,7 @@ class OpenSslJnaCipher implements CryptoCipher {
if(context != null) {
OpenSslNativeJna.EVP_CIPHER_CTX_cleanup(context);
}
- throw new RuntimeException("return code "+retVal+" from openssl. Err code is "+err+": "+errdesc);
+ throw new RuntimeException("return code "+retVal+" from OpenSSL. Err code is "+err+": "+errdesc);
}
}
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af77e868/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java
index 7ab0b48..4302038 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java
@@ -149,7 +149,7 @@ class OpenSslJnaCryptoRandom extends Random implements CryptoRandom {
}
/**
- * Overrides {@link java.lang.AutoCloseable#close()}. Closes openssl context
+ * Overrides {@link java.lang.AutoCloseable#close()}. Closes OpenSSL context
* if native enabled.
*/
@Override
@@ -184,7 +184,7 @@ class OpenSslJnaCryptoRandom extends Random implements CryptoRandom {
NativeLong err = OpenSslNativeJna.ERR_peek_error();
String errdesc = OpenSslNativeJna.ERR_error_string(err, null);
close();
- throw new RuntimeException("return code "+retVal+" from openssl. Err code is "+err+": "+errdesc);
+ throw new RuntimeException("return code "+retVal+" from OpenSSL. Err code is "+err+": "+errdesc);
}
}
}
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af77e868/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java b/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
index b02139e..8368ef7 100644
--- a/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
+++ b/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
@@ -135,7 +135,7 @@ class OpenSslCryptoRandom extends Random implements CryptoRandom {
}
/**
- * Overrides {@link java.lang.AutoCloseable#close()}. Closes openssl context
+ * Overrides {@link java.lang.AutoCloseable#close()}. Closes OpenSSL context
* if native enabled.
*/
@Override