Removed unused code and more cleanup

- whitespace fixes
- initialize uninitialized class field
- use existing typedef instead of longform of UniquePtr specialization

Test: VtsHalKeymasterV3_0TargetTest
Bug: 67358942
Change-Id: I18adb32952315a0392399c2d74a11d7990f435b0

4 files changed, 5 insertions, 3 deletions

diff --git a/include/keymaster/km_openssl/asymmetric_key.h b/include/keymaster/km_openssl/asymmetric_key.h
index 8eec7e5..f7d4f0f 100644
--- a/include/keymaster/km_openssl/asymmetric_key.h
+++ b/include/keymaster/km_openssl/asymmetric_key.h
@@ -28,6 +28,7 @@ class AsymmetricKey : public Key {
     AsymmetricKey(const AuthorizationSet& hw_enforced, const AuthorizationSet& sw_enforced,
                   keymaster_error_t* error)
         : Key(hw_enforced, sw_enforced, error) {}
+    virtual ~AsymmetricKey() {}
 
     keymaster_error_t formatted_key_material(keymaster_key_format_t format,
                                              UniquePtr<uint8_t[]>* material,
diff --git a/include/keymaster/km_openssl/ec_key.h b/include/keymaster/km_openssl/ec_key.h
index 57ee7d0..c2d4b55 100644
--- a/include/keymaster/km_openssl/ec_key.h
+++ b/include/keymaster/km_openssl/ec_key.h
@@ -31,6 +31,7 @@ class EcKey : public AsymmetricKey {
     EcKey(const AuthorizationSet& hw_enforced, const AuthorizationSet& sw_enforced,
           keymaster_error_t* error)
         : AsymmetricKey(hw_enforced, sw_enforced, error) {}
+    virtual ~EcKey() {}
 
     bool InternalToEvp(EVP_PKEY* pkey) const override;
     bool EvpToInternal(const EVP_PKEY* pkey) override;
@@ -43,7 +44,7 @@ class EcKey : public AsymmetricKey {
         : AsymmetricKey(hw_enforced, sw_enforced, error), ec_key_(ec_key) {}
 
   private:
-    UniquePtr<EC_KEY, EC_KEY_Delete> ec_key_;
+    EC_KEY_Ptr ec_key_;
 };
 
 }  // namespace keymaster
diff --git a/include/keymaster/km_openssl/ecdsa_operation.h b/include/keymaster/km_openssl/ecdsa_operation.h
index 0adad10..eeb3fb8 100644
--- a/include/keymaster/km_openssl/ecdsa_operation.h
+++ b/include/keymaster/km_openssl/ecdsa_operation.h
@@ -29,7 +29,7 @@ namespace keymaster {
 class EcdsaOperation : public Operation {
   public:
     EcdsaOperation(keymaster_purpose_t purpose, keymaster_digest_t digest, EVP_PKEY* key)
-        : Operation(purpose), digest_(digest), ecdsa_key_(key) {
+        : Operation(purpose), digest_(digest), digest_algorithm_(nullptr), ecdsa_key_(key) {
         EVP_MD_CTX_init(&digest_ctx_);
     }
     ~EcdsaOperation();
diff --git a/include/keymaster/km_openssl/nist_curve_key_exchange.h b/include/keymaster/km_openssl/nist_curve_key_exchange.h
index 4b2a016..8d2fa84 100644
--- a/include/keymaster/km_openssl/nist_curve_key_exchange.h
+++ b/include/keymaster/km_openssl/nist_curve_key_exchange.h
@@ -69,4 +69,4 @@ class NistCurveKeyExchange : public KeyExchange {
 
 }  // namespace keymaster
 
-#endif  // SYSTEM_KEYMASTER_NIST_CURVE_KEY_EXCHANGE_H_
\ No newline at end of file
+#endif  // SYSTEM_KEYMASTER_NIST_CURVE_KEY_EXCHANGE_H_