commit 407d41282d6b0a7f2d6e2826d44a58b016a5d844
author Shawn Willden <swillden@google.com> Mon Aug 25 16:49:13 2014 -0600
committer Shawn Willden <swillden@google.com> Mon Aug 25 20:38:56 2014 -0600
tree 9e5abd1e4c5891a9886ccec1344906a716f0696c
parent 2f3be368e5ad911cc0b014421dd3682130260ffc

Implement TrustyKeymaster key generation, plus tests.

Change-Id: I085be101c735d136e7d5b2915a9510102722e695

asymmetric_key.cpp

diff --git a/asymmetric_key.cpp b/asymmetric_key.cpp
index b3bf733..d4cc226 100644
--- a/asymmetric_key.cpp
+++ b/asymmetric_key.cpp
@@ -286,9 +286,6 @@
     if (!authorizations.GetTagValue(TAG_KEY_SIZE, &key_size))
         authorizations.push_back(Authorization(TAG_KEY_SIZE, key_size));
 
-    UniquePtr<uint8_t[]> key_data;
-    size_t key_data_size;
-
     UniquePtr<DSA, DSA_Delete> dsa_key(DSA_new());
     UniquePtr<EVP_PKEY, EVP_PKEY_Delete> pkey(EVP_PKEY_new());
     if (dsa_key.get() == NULL || pkey.get() == NULL) {
@@ -300,18 +297,19 @@
     *error = KM_ERROR_INVALID_DSA_PARAMS;
 
     if (g_blob.data == NULL && p_blob.data == NULL && q_blob.data == NULL) {
-        // No params provided, generate them.
+        logger.log("DSA parameters unspecified, generating them for key size %d\n", key_size);
         if (!DSA_generate_parameters_ex(dsa_key.get(), key_size, NULL /* seed */, 0 /* seed_len */,
                                         NULL /* counter_ret */, NULL /* h_ret */,
-                                        NULL /* callback */))
-            // TODO(swillden): return a more precise error, depending on ERR_get_error();
+                                        NULL /* callback */)) {
+            logger.log("DSA parameter generation failed.\n");
             return NULL;
+        }
 
         SetDsaParamData(&authorizations, TAG_DSA_GENERATOR, dsa_key->g);
         SetDsaParamData(&authorizations, TAG_DSA_P, dsa_key->p);
         SetDsaParamData(&authorizations, TAG_DSA_Q, dsa_key->q);
     } else if (g_blob.data == NULL || p_blob.data == NULL || q_blob.data == NULL) {
-        // Some params provided: that's an error.  Provide them all or provide none.
+        logger.log("Some DSA parameters provided.  Provide all or none\n");
         return NULL;
     } else {
         // All params provided. Use them.
@@ -319,8 +317,9 @@
         dsa_key->p = BN_bin2bn(p_blob.data, p_blob.data_length, NULL);
         dsa_key->q = BN_bin2bn(q_blob.data, q_blob.data_length, NULL);
 
-        if (dsa_key->g == NULL || dsa_key->p == NULL || dsa_key->q == NULL)
+        if (dsa_key->g == NULL || dsa_key->p == NULL || dsa_key->q == NULL) {
             return NULL;
+        }
     }
 
     if (!DSA_generate_key(dsa_key.get())) {