Merge pull request #15 from AzCiS/parvezah

Fixing the Error Messages shown when decrytion fails with the given regi...

Author: avirupch

src/ServiceManagement/StorSimple/Commands.StorSimple/Encryption/EncryptionCmdLetHelper.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Security.Cryptography;
 using Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets.Library;
 using Microsoft.WindowsAzure.Commands.StorSimple.Properties;
 
@@ -89,7 +90,19 @@ public static void ValidatePersistedCIK(StorSimpleCmdletBase cmdlet, string reso
             string cik = RetrieveCIK(cmdlet, resourceId);
 
             StorSimpleCryptoManager cryptMgr = new StorSimpleCryptoManager(cmdlet.StorSimpleClient);
-            string rakPub = cryptMgr.GetPlainTextRAKPub(cik);
+
+            string rakPub = null;
+
+            try
+            {
+                rakPub = cryptMgr.GetPlainTextRAKPub(cik);
+            }
+            catch (CryptographicException exception)
+            {
+                // This case is to handle the failures during decrypting the Rak Pub
+                cmdlet.WriteVerbose(string.Format(Resources.CIKInvalidWithException, exception.Message));
+                throw new Exception(Resources.CIKInvalidWhileDecrypting);
+            }
 
             if (string.IsNullOrEmpty(rakPub))
             {

src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.Designer.cs

@@ -507,4 +507,10 @@
   <data name="JobNotRunningOrCancellable" xml:space="preserve">
     <value>Cannot stop job with id {0}. It is not a running cancellable job.</value>
   </data>
+  <data name="CIKInvalidWhileDecrypting" xml:space="preserve">
+    <value>Invalid Registration Key, Please enter the valid registration key copied from the Portal.</value>
+  </data>
+  <data name="CIKInvalidWithException" xml:space="preserve">
+    <value>Invalid value for Registration Key. CIK provided couldnt be used to decrypt the secrets! The exact exception while decrypting is "{0}"!</value>
+  </data>
 </root>