Merge pull request #47 from tiffanyachen/dev

Updating to released API version and package versions

README.md

@@ -15,27 +15,27 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
 </dependency>
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-cryptography</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
 </dependency>
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-extensions</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
 </dependency>
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-core</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
 </dependency>
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-webkey</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
 </dependency>
 ```
 

azure-keyvault-core/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

azure-keyvault-core/src/main/java/com/microsoft/azure/keyvault/core/IKeyResolver.java

@@ -1,19 +1,7 @@
 /**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.keyvault.core;

azure-keyvault-cryptography/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-keyvault-webkey</artifactId>
-            <version>1.1-beta-1</version>
+            <version>1.1</version>
         </dependency>
         		<dependency>
 			<groupId>com.microsoft.azure</groupId>

azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/AlgorithmResolver.java

@@ -18,7 +18,7 @@
 import com.microsoft.azure.keyvault.cryptography.algorithms.AesKw128;
 import com.microsoft.azure.keyvault.cryptography.algorithms.AesKw192;
 import com.microsoft.azure.keyvault.cryptography.algorithms.AesKw256;
-import com.microsoft.azure.keyvault.cryptography.algorithms.Ecdsa256;
+import com.microsoft.azure.keyvault.cryptography.algorithms.Es256k;
 import com.microsoft.azure.keyvault.cryptography.algorithms.Es256;
 import com.microsoft.azure.keyvault.cryptography.algorithms.Es384;
 import com.microsoft.azure.keyvault.cryptography.algorithms.Es512;
@@ -49,7 +49,7 @@ public class AlgorithmResolver {
         Default.put( Rs256.ALGORITHM_NAME, new Rs256() );
         // Default.put( RsNull.ALGORITHM_NAME, new RsNull() );
 
-        Default.put(Ecdsa256.ALGORITHM_NAME, new Ecdsa256());
+        Default.put(Es256k.ALGORITHM_NAME, new Es256k());
         Default.put(Es256.ALGORITHM_NAME, new Es256());
         Default.put(Es384.ALGORITHM_NAME, new Es384());
         Default.put(Es512.ALGORITHM_NAME, new Es512());

azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/EcKey.java

@@ -27,7 +27,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.microsoft.azure.keyvault.core.IKey;
 import com.microsoft.azure.keyvault.cryptography.algorithms.Ecdsa;
-import com.microsoft.azure.keyvault.cryptography.algorithms.Ecdsa256;
+import com.microsoft.azure.keyvault.cryptography.algorithms.Es256k;
 import com.microsoft.azure.keyvault.cryptography.algorithms.Es256;
 import com.microsoft.azure.keyvault.cryptography.algorithms.Es384;
 import com.microsoft.azure.keyvault.cryptography.algorithms.Es512;
@@ -40,18 +40,18 @@ public class EcKey implements IKey {
 	public static final String P256 = "secp256r1";
 	public static final String P384 = "secp384r1";
 	public static final String P521 = "secp521r1";
-	public static final String SECP265K1 = "secp256k1";
+	public static final String P256K = "secp256k1";
 	public static final Map<JsonWebKeyCurveName, String> CURVE_TO_SIGNATURE = ImmutableMap.<JsonWebKeyCurveName, String>builder()
 			.put(JsonWebKeyCurveName.P_256, Es256.ALGORITHM_NAME)
 			.put(JsonWebKeyCurveName.P_384, Es384.ALGORITHM_NAME)
 			.put(JsonWebKeyCurveName.P_521, Es512.ALGORITHM_NAME)
-			.put(JsonWebKeyCurveName.SECP256K1, Ecdsa256.ALGORITHM_NAME)
+			.put(JsonWebKeyCurveName.P_256K, Es256k.ALGORITHM_NAME)
 			.build();
 	public static final Map<JsonWebKeyCurveName, String> CURVE_TO_SPEC_NAME = ImmutableMap.<JsonWebKeyCurveName, String>builder()
 			.put(JsonWebKeyCurveName.P_256, P256)
 			.put(JsonWebKeyCurveName.P_384, P384)
 			.put(JsonWebKeyCurveName.P_521, P521)
-			.put(JsonWebKeyCurveName.SECP256K1, SECP265K1)
+			.put(JsonWebKeyCurveName.P_256K, P256K)
 			.build();			
 
 
@@ -243,7 +243,7 @@ private JsonWebKeyCurveName getCurveFromKeyPair(KeyPair keyPair) {
 			ECParameterSpec spec = key.getParams();
 			EllipticCurve crv = spec.getCurve();
 
-			List<JsonWebKeyCurveName> curveList = Arrays.asList(JsonWebKeyCurveName.P_256, JsonWebKeyCurveName.P_384, JsonWebKeyCurveName.P_521, JsonWebKeyCurveName.SECP256K1);
+			List<JsonWebKeyCurveName> curveList = Arrays.asList(JsonWebKeyCurveName.P_256, JsonWebKeyCurveName.P_384, JsonWebKeyCurveName.P_521, JsonWebKeyCurveName.P_256K);
 
 			for (JsonWebKeyCurveName curve : curveList) {
 				ECGenParameterSpec gps = new ECGenParameterSpec(CURVE_TO_SPEC_NAME.get(curve));

azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Ecdsa256.java → azure-keyvault-cryptography/src/main/java/com/microsoft/azure/keyvault/cryptography/algorithms/Es256k.java

@@ -1,6 +1,6 @@
 package com.microsoft.azure.keyvault.cryptography.algorithms;
 
-public class Ecdsa256 extends Ecdsa {
+public class Es256k extends Ecdsa {
     public final static String ALGORITHM_NAME = "NONEwithECDSA";
 
     @Override

azure-keyvault-cryptography/src/test/java/com/microsoft/azure/keyvault/cryptography/test/ECKeyTest.java

@@ -92,10 +92,10 @@ public static void setUpBeforeClass() throws Exception {
 			.put(JsonWebKeyCurveName.P_256, DIGEST_256)
 			.put(JsonWebKeyCurveName.P_384, DIGEST_384)
 			.put(JsonWebKeyCurveName.P_521, DIGEST_512)
-			.put(JsonWebKeyCurveName.SECP256K1, DIGEST_256)
+			.put(JsonWebKeyCurveName.P_256K, DIGEST_256)
 			.build();
     	//JsonWebKeyCurveName.SECP256K1)
-    	CURVE_LIST = Arrays.asList(JsonWebKeyCurveName.P_256, JsonWebKeyCurveName.P_384, JsonWebKeyCurveName.P_521, JsonWebKeyCurveName.SECP256K1);
+    	CURVE_LIST = Arrays.asList(JsonWebKeyCurveName.P_256, JsonWebKeyCurveName.P_384, JsonWebKeyCurveName.P_521, JsonWebKeyCurveName.P_256K);
     }
 
     @Test
@@ -233,7 +233,7 @@ public void testCreateSECP256K1Key() throws Exception {
         final KeyPairGenerator generator = KeyPairGenerator.getInstance("EC");
 
         generator.initialize(gps);
-        EcKey key = new EcKey("akey", JsonWebKeyCurveName.SECP256K1);
+        EcKey key = new EcKey("akey", JsonWebKeyCurveName.P_256K);
     }
 
     @Test

azure-keyvault-extensions/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
-    <version>1.1-beta-1</version>
+    <version>1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -68,24 +68,30 @@
     <dependency>
     	<groupId>com.microsoft.azure</groupId>
     	<artifactId>azure-keyvault-core</artifactId>
-    	<version>1.1-beta-1</version>
+    	<version>1.1</version>
     </dependency>
     <dependency>
     	<groupId>com.microsoft.azure</groupId>
     	<artifactId>azure-keyvault-cryptography</artifactId>
-    	<version>1.1-beta-1</version>
+    	<version>1.1</version>
     </dependency>
     <dependency>
     	<groupId>com.microsoft.azure</groupId>
     	<artifactId>azure-keyvault</artifactId>
-    	<version>1.1-beta-1</version>
+    	<version>1.1</version>
     </dependency>
     <dependency>
     	<groupId>com.microsoft.azure</groupId>
     	<artifactId>azure-keyvault-webkey</artifactId>
-    	<version>1.1-beta-1</version>
+    	<version>1.1</version>
     </dependency>
-        <dependency>
+      		<dependency>
+			<groupId>com.microsoft.azure</groupId>
+			<artifactId>azure</artifactId>
+			<version>1.3.0</version>
+			<scope>test</scope>
+		</dependency>
+      <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-mgmt-resources</artifactId>
       <version>1.3.1-SNAPSHOT</version>

azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/AggregateKeyResolver.java

@@ -1,19 +1,7 @@
 /**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.keyvault.extensions;

azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/CachingKeyResolver.java

@@ -1,19 +1,7 @@
 /**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.keyvault.extensions;

azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKey.java

@@ -1,21 +1,8 @@
 /**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
-
 package com.microsoft.azure.keyvault.extensions;
 
 import java.io.IOException;

azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/KeyVaultKeyResolver.java

@@ -1,19 +1,7 @@
 /**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.keyvault.extensions;

azure-keyvault-extensions/src/main/java/com/microsoft/azure/keyvault/extensions/Strings.java

@@ -1,19 +1,7 @@
 /**
- *
- * Copyright (c) Microsoft and contributors.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.keyvault.extensions;