Merge pull request #122 from elmatadorinho/master

Adding methods to load Public/Private keys from a decoded byte array.…

Author: martijndwars

src/main/java/nl/martijndwars/webpush/Notification.java

@@ -194,6 +194,11 @@ public NotificationBuilder userPublicKey(String publicKey) throws NoSuchAlgorith
             return this;
         }
 
+        public NotificationBuilder userPublicKey(byte[] publicKey) throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException {
+            this.userPublicKey = (ECPublicKey) Utils.loadPublicKey(publicKey);
+            return this;
+        }
+
         public NotificationBuilder userAuth(String userAuth) {
             this.userAuth = Base64Encoder.decode(userAuth);
             return this;

src/main/java/nl/martijndwars/webpush/Utils.java

@@ -46,6 +46,15 @@ public static byte[] encode(ECPrivateKey privateKey) {
      */
     public static PublicKey loadPublicKey(String encodedPublicKey) throws NoSuchProviderException, NoSuchAlgorithmException, InvalidKeySpecException {
         byte[] decodedPublicKey = Base64Encoder.decode(encodedPublicKey);
+        return loadPublicKey(decodedPublicKey);
+    }
+
+    /**
+     * Load the public key from a byte array. 
+     *
+     * @param decodedPublicKey
+     */
+    public static PublicKey loadPublicKey(byte[] decodedPublicKey) throws NoSuchProviderException, NoSuchAlgorithmException, InvalidKeySpecException {
         KeyFactory keyFactory = KeyFactory.getInstance(ALGORITHM, PROVIDER_NAME);
         ECParameterSpec parameterSpec = ECNamedCurveTable.getParameterSpec(CURVE);
         ECCurve curve = parameterSpec.getCurve();
@@ -66,6 +75,19 @@ public static PublicKey loadPublicKey(String encodedPublicKey) throws NoSuchProv
      */
     public static PrivateKey loadPrivateKey(String encodedPrivateKey) throws NoSuchProviderException, NoSuchAlgorithmException, InvalidKeySpecException {
         byte[] decodedPrivateKey = Base64Encoder.decode(encodedPrivateKey);
+        return loadPrivateKey(decodedPrivateKey);
+    }
+
+    /**
+     * Load the private key from a byte array
+     *
+     * @param decodedPrivateKey
+     * @return
+     * @throws NoSuchProviderException
+     * @throws NoSuchAlgorithmException
+     * @throws InvalidKeySpecException
+     */
+    public static PrivateKey loadPrivateKey(byte[] decodedPrivateKey) throws NoSuchProviderException, NoSuchAlgorithmException, InvalidKeySpecException {
         BigInteger s = BigIntegers.fromUnsignedByteArray(decodedPrivateKey);
         ECParameterSpec parameterSpec = ECNamedCurveTable.getParameterSpec(CURVE);
         ECPrivateKeySpec privateKeySpec = new ECPrivateKeySpec(s, parameterSpec);