package com.yubico.client.v2;

/* 	Copyright (c) 2011, Simon Buckle.  All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:

	* Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.

	* Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following
	disclaimer in the documentation and/or other materials provided
	with the distribution.

	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
	CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
	BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
	EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
	TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
	ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
	TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
	THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.

	Written by Simon Buckle <simon@webteq.eu>, September 2011.
*/

import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;

import org.apache.commons.codec.binary.Base64;

import com.yubico.client.v2.exceptions.YubicoSignatureException;

public class Signature {

	private final static String HMAC_SHA1 = "HmacSHA1";

	public static String calculate(String data, byte[] key)
			throws YubicoSignatureException {
		try {
			SecretKeySpec signingKey = new SecretKeySpec(key, HMAC_SHA1);
	        Mac mac = Mac.getInstance(HMAC_SHA1);
	        mac.init(signingKey);        
	        byte[] raw = mac.doFinal(data.getBytes("UTF-8"));
	        // Base64 encode the result;
	        return Base64.encodeBase64String(raw);
		} catch (Exception e) {
			throw new YubicoSignatureException("Failed to generate signature: ", e);
		}
	}
}

@@ -1405,16 +1405,151 @@
 11.%0A*/%0A%0A
+import java.io.UnsupportedEncodingException;%0Aimport java.security.InvalidKeyException;%0Aimport java.security.NoSuchAlgorithmException;%0A%0A
 import j
@@ -1565,16 +1565,16 @@
 to.Mac;%0A
-
 import j
@@ -1968,24 +1968,18 @@
 SHA1);%0A%09
-        
+%09%09
 Mac mac 
@@ -2009,24 +2009,18 @@
 SHA1);%0A%09
-        
+%09%09
 mac.init
@@ -2042,24 +2042,18 @@
       %0A%09
-        
+%09%09
 byte%5B%5D r
@@ -2095,24 +2095,18 @@
 -8%22));%0A%09
-        
+%09%09
 // Base6
@@ -2127,24 +2127,18 @@
 esult;%0A%09
-        
+%09%09
 return B
@@ -2179,16 +2179,31 @@
  catch (
+NoSuchAlgorithm
 Exceptio
@@ -2252,38 +2252,374 @@
 on(%22
-Failed to generate signature: 
+No such algorithm (HMAC_SHA1?)%22, e);%0A%09%09%7D catch (InvalidKeyException e) %7B%0A%09%09%09throw new YubicoSignatureException(%22Invalid key in signature.%22, e);%0A%09%09%7D catch (IllegalStateException e) %7B%0A%09%09%09throw new YubicoSignatureException(%22Illegal state in signature%22, e);%0A%09%09%7D catch (UnsupportedEncodingException e) %7B%0A%09%09%09throw new YubicoSignatureException(%22Unsupported encoding (utf8?)
 %22, e

remove the catch-all exception in signature