You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2010/02/26 09:10:35 UTC
svn commit: r916613 - in
/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers:
AbstractMethodAlgorithm.java hmac/HmacSha1MethodAlgorithm.java
rsa/RsaSha1MethodAlgorithm.java
Author: simonetripodi
Date: Fri Feb 26 08:10:34 2010
New Revision: 916613
URL: http://svn.apache.org/viewvc?rev=916613&view=rev
Log:
byte sequence to (not chunked) Base64 encoded string algorithm extracted as a method to be reused in subclasses
Modified:
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/AbstractMethodAlgorithm.java
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/hmac/HmacSha1MethodAlgorithm.java
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/RsaSha1MethodAlgorithm.java
Modified: labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/AbstractMethodAlgorithm.java
URL: http://svn.apache.org/viewvc/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/AbstractMethodAlgorithm.java?rev=916613&r1=916612&r2=916613&view=diff
==============================================================================
--- labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/AbstractMethodAlgorithm.java (original)
+++ labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/AbstractMethodAlgorithm.java Fri Feb 26 08:10:34 2010
@@ -25,6 +25,7 @@
import java.util.List;
import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.net.URLCodec;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -316,6 +317,17 @@
}
/**
+ * Encodes a bytes sequence applying the Base64 algorithm without chuncking
+ * the output string.
+ *
+ * @param sequence the bytes sequence has to be encoded.
+ * @return the Base64 encoded string.
+ */
+ protected static String base64Encode(byte[] sequence) {
+ return new String(Base64.encodeBase64(sequence, false));
+ }
+
+ /**
* Add the input parameter in the list, encoding the parameter name/value
* first, then putting it in the list in the right position
*
Modified: labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/hmac/HmacSha1MethodAlgorithm.java
URL: http://svn.apache.org/viewvc/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/hmac/HmacSha1MethodAlgorithm.java?rev=916613&r1=916612&r2=916613&view=diff
==============================================================================
--- labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/hmac/HmacSha1MethodAlgorithm.java (original)
+++ labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/hmac/HmacSha1MethodAlgorithm.java Fri Feb 26 08:10:34 2010
@@ -22,7 +22,6 @@
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.codec.binary.Base64;
import org.apache.labs.amber.signature.signers.AbstractMethodAlgorithm;
import org.apache.labs.amber.signature.signers.SignatureException;
import org.apache.labs.amber.signature.signers.SignatureMethod;
@@ -72,7 +71,7 @@
byte[] rawHmac = mac.doFinal(baseString.getBytes());
- return new String(Base64.encodeBase64(rawHmac, false));
+ return base64Encode(rawHmac);
}
/**
Modified: labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/RsaSha1MethodAlgorithm.java
URL: http://svn.apache.org/viewvc/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/RsaSha1MethodAlgorithm.java?rev=916613&r1=916612&r2=916613&view=diff
==============================================================================
--- labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/RsaSha1MethodAlgorithm.java (original)
+++ labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/RsaSha1MethodAlgorithm.java Fri Feb 26 08:10:34 2010
@@ -18,7 +18,6 @@
import java.security.Signature;
-import org.apache.commons.codec.binary.Base64;
import org.apache.labs.amber.signature.signers.AbstractMethodAlgorithm;
import org.apache.labs.amber.signature.signers.SignatureException;
import org.apache.labs.amber.signature.signers.SignatureMethod;
@@ -50,7 +49,7 @@
byte[] signature = signer.sign();
- return new String(Base64.encodeBase64(signature, false));
+ return base64Encode(signature);
} catch (Exception e) {
throw new SignatureException(new StringBuilder("An error occurred while signing base string '")
.append(baseString)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org