Reorganize where some CVC code goes to avoid template bloat + VC problems

1 files changed, 19 insertions, 71 deletions

diff --git a/src/cert/cvc/eac_obj.h b/src/cert/cvc/eac_obj.h
index d4f02c530..60da7126e 100644
--- a/src/cert/cvc/eac_obj.h
+++ b/src/cert/cvc/eac_obj.h
@@ -8,12 +8,8 @@
 #ifndef BOTAN_EAC_OBJ_H__
 #define BOTAN_EAC_OBJ_H__
 
-#include <botan/ecdsa_sig.h>
 #include <botan/signed_obj.h>
-#include <botan/look_pk.h>
-#include <botan/oids.h>
-#include <memory>
-#include <string>
+#include <botan/ecdsa_sig.h>
 
 namespace Botan {
 
@@ -23,84 +19,36 @@ namespace Botan {
 template<typename Derived> // CRTP is used enable the call sequence:
 class BOTAN_DLL EAC1_1_obj : public EAC_Signed_Object
    {
-      // data members first:
-   protected:
-
-      ECDSA_Signature m_sig;
-
-      // member functions here:
    public:
       /**
       * Return the signature as a concatenation of the encoded parts.
       * @result the concatenated signature
       */
-      SecureVector<byte> get_concat_sig() const;
+      SecureVector<byte> get_concat_sig() const
+         { return m_sig.get_concatenation(); }
 
-      /**
-      * Verify the signature of this objects.
-      * @param pub_key the public key to verify the signature with
-      * @result true if the verification succeeded
-      */
-      virtual bool check_signature(Public_Key& pub_key) const;
+      bool check_signature(class Public_Key& key) const
+         {
+         return EAC_Signed_Object::check_signature(key, m_sig.DER_encode());
+         }
 
    protected:
-      void init(DataSource& in);
-
-      virtual ~EAC1_1_obj<Derived>(){}
-
-   };
-
-template<typename Derived>
-SecureVector<byte> EAC1_1_obj<Derived>::get_concat_sig() const
-   {
-   return m_sig.get_concatenation();
-   }
-
-template<typename Derived>
-void EAC1_1_obj<Derived>::init(DataSource& in)
-   {
-   try
-      {
-      Derived::decode_info(in, tbs_bits, m_sig);
-      }
-   catch(Decoding_Error)
-      {
-      throw Decoding_Error(PEM_label_pref + " decoding failed");
-      }
-   }
-
-template<typename Derived>
-bool EAC1_1_obj<Derived>::check_signature(Public_Key& pub_key) const
-   {
-   try
-      {
-      std::vector<std::string> sig_info =
-         split_on(OIDS::lookup(sig_algo.oid), '/');
+      ECDSA_Signature m_sig;
 
-      if(sig_info.size() != 2 || sig_info[0] != pub_key.algo_name())
+      void init(DataSource& in)
          {
-         return false;
+         try
+            {
+            Derived::decode_info(in, tbs_bits, m_sig);
+            }
+         catch(Decoding_Error)
+            {
+            throw Decoding_Error(PEM_label_pref + " decoding failed");
+            }
          }
 
-      std::string padding = sig_info[1];
-      Signature_Format format =
-         (pub_key.message_parts() >= 2) ? DER_SEQUENCE : IEEE_1363;
-
-      if(!dynamic_cast<PK_Verifying_wo_MR_Key*>(&pub_key))
-         return false;
-
-      SecureVector<byte> seq_sig = m_sig.DER_encode();
-      SecureVector<byte> to_sign = tbs_data();
-
-      PK_Verifying_wo_MR_Key& sig_key = dynamic_cast<PK_Verifying_wo_MR_Key&>(pub_key);
-      std::auto_ptr<PK_Verifier> verifier(get_pk_verifier(sig_key, padding, format));
-      return verifier->verify_message(to_sign, seq_sig);
-      }
-   catch(...)
-      {
-      return false;
-      }
-   }
+      virtual ~EAC1_1_obj<Derived>(){}
+   };
 
 }