Cleanup.

vcsjones · Sep 5, 2017 · fc5dfcc · fc5dfcc
1 parent eded172
commit fc5dfcc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/AzureSignTool/AuthenticodeKeyVaultSigner.cs b/AzureSignTool/AuthenticodeKeyVaultSigner.cs
@@ -99,8 +99,8 @@ public int SignFile(string path, string description, string descriptionUrl)
                         ref signatureInfo,
                         IntPtr.Zero,
                         timeStampFlags,
-                        timeStampFlags != 0 ? AlgorithmTranslator.HashAlgorithmToOid(_timeStampConfiguration.DigestAlgorithm) : null,
-                        timeStampFlags != 0 ? _timeStampConfiguration.Url : null,
+                        timestampAlgorithmOid,
+                        timestampUrl,
                         IntPtr.Zero, IntPtr.Zero,
                         out signerContext,
                         IntPtr.Zero,

diff --git a/AzureSignTool/Program.cs b/AzureSignTool/Program.cs
@@ -53,7 +53,7 @@ static int Main(string[] args)
                         AzureClientId = azureKeyVaultClientId.Value(),
                         AzureAccessToken = azureKeyVaultAccessToken.Value(),
                         AzureClientSecret = azureKeyVaultClientSecret.Value(),
-                        FileDigestAlgorithm = AlgorithmFromInput(fileDigestAlgorithm.Value()).GetValueOrDefault(HashAlgorithmName.SHA256)
+                        FileDigestAlgorithm = GetValueFromOption(fileDigestAlgorithm, AlgorithmFromInput, HashAlgorithmName.SHA256)
                     };
 
                     var timestampConfiguration = new TimeStampConfiguration
@@ -62,16 +62,22 @@ static int Main(string[] args)
                               acTimeStamp.HasValue() ? acTimeStamp.Value() : null,
                         Type = rfc3161TimeStamp.HasValue() ? TimeStampType.RFC3161 :
                               acTimeStamp.HasValue() ? TimeStampType.Authenticode : TimeStampType.None,
-                        DigestAlgorithm = rfc3161Digest.HasValue() ?
-                            AlgorithmFromInput(rfc3161Digest.Value()).GetValueOrDefault(HashAlgorithmName.SHA256) :
-                            HashAlgorithmName.SHA256
+                        DigestAlgorithm = GetValueFromOption(rfc3161Digest, AlgorithmFromInput, HashAlgorithmName.SHA256)
                     };
 
                     using (var materialized = await KeyVaultConfigurationDiscoverer.Materialize(configuration))
                     using (var signer = new AuthenticodeKeyVaultSigner(materialized, timestampConfiguration))
                     {
+                        const int S_OK = 0;
                         var result = signer.SignFile(file.Value, description.Value(), descriptionUrl.Value());
-                        Console.WriteLine($"Signing completed as {result}.");
+                        if (result == S_OK)
+                        {
+                            Console.WriteLine("Signing completed successfully.");
+                        }
+                        else
+                        {
+                            Console.WriteLine($"Signing failed with error {result}.");
+                        }
                         return result;
                     }
                 });
@@ -128,5 +134,23 @@ private static bool CheckRequired(params CommandOption[] commands)
             }
             return true;
         }
+
+        private static T GetValueFromOption<T>(CommandOption option, Func<string, T> transform, T defaultIfNull) where T:class
+        {
+            if (!option.HasValue())
+            {
+                return defaultIfNull;
+            }
+            return transform(option.Value()) ?? defaultIfNull;
+        }
+
+        private static T GetValueFromOption<T>(CommandOption option, Func<string, T?> transform, T defaultIfNull) where T:struct
+        {
+            if (!option.HasValue())
+            {
+                return defaultIfNull;
+            }
+            return transform(option.Value()) ?? defaultIfNull;
+        }
     }
 }