oops, missed this in the previous commit

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1904 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/dnsseckeeper.hh b/pdns/dnsseckeeper.hh
index a3ef49dff34ee286a23fcb7b8de8b15402ef8b7e..19dc03a1831b70b7faca379042041fae678b9559 100644 (file)
--- a/pdns/dnsseckeeper.hh
+++ b/pdns/dnsseckeeper.hh
@@ -1,7 +1,6 @@
 #ifndef PDNSDNSSECKEEPER_HH
 #define PDNSDNSSECKEEPER_HH
 #include <string>
-#include <polarssl/rsa.h>
 #include <string.h>
 #include <vector>
 #include <boost/logic/tribool.hpp>
@@ -10,106 +9,11 @@
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/multi_index/key_extractors.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
-
-using namespace ::boost::multi_index;
+#include "dnssecinfra.hh"
 #include "dnsrecords.hh"
 #include "ueberbackend.hh"
 
-#define PDNSSEC_MI(x) mpi_init(&d_context.x, 0)
-#define PDNSSEC_MC(x) PDNSSEC_MI(x); mpi_copy(&d_context.x, const_cast<mpi*>(&orig.d_context.x))
-#define PDNSSEC_MF(x) mpi_free(&d_context.x, 0)
-
-inline bool operator<(const mpi& a, const mpi& b)
-{
-  return mpi_cmp_mpi(&a, &b) < 0;
-}
-
-class RSAContext
-{
-public:
-  RSAContext()
-  {
-    memset(&d_context, 0, sizeof(d_context));
-    PDNSSEC_MI(N); 
-    PDNSSEC_MI(E); PDNSSEC_MI(D); PDNSSEC_MI(P); PDNSSEC_MI(Q); PDNSSEC_MI(DP); PDNSSEC_MI(DQ); PDNSSEC_MI(QP); PDNSSEC_MI(RN); PDNSSEC_MI(RP); PDNSSEC_MI(RQ);
-  }
-
-  ~RSAContext()
-  {
-    PDNSSEC_MF(N); 
-    PDNSSEC_MF(E); PDNSSEC_MF(D); PDNSSEC_MF(P); PDNSSEC_MF(Q); PDNSSEC_MF(DP); PDNSSEC_MF(DQ); PDNSSEC_MF(QP); PDNSSEC_MF(RN); PDNSSEC_MF(RP); PDNSSEC_MF(RQ);
-  }
-
-  bool operator<(const RSAContext& rhs) const
-  {
-    return tie(d_context.N, d_context.E, d_context.D, d_context.P, d_context.Q, d_context.DP, d_context.DQ, d_context.QP)
-    < tie(rhs.d_context.N, rhs.d_context.E, rhs.d_context.D, rhs.d_context.P, rhs.d_context.Q, rhs.d_context.DP, rhs.d_context.DQ, rhs.d_context.QP);
-  }
-
-  RSAContext(const RSAContext& orig) 
-  {
-    d_context.ver = orig.d_context.ver;
-    d_context.len = orig.d_context.len;
-
-    d_context.padding = orig.d_context.padding;
-    d_context.hash_id = orig.d_context.hash_id;
-    d_context.f_rng = orig.d_context.f_rng;
-    d_context.p_rng = orig.d_context.p_rng;
-    
-    PDNSSEC_MC(N); 
-    PDNSSEC_MC(E); PDNSSEC_MC(D); PDNSSEC_MC(P); PDNSSEC_MC(Q); PDNSSEC_MC(DP); PDNSSEC_MC(DQ); PDNSSEC_MC(QP); PDNSSEC_MC(RN); PDNSSEC_MC(RP); PDNSSEC_MC(RQ);
-  }
-
-  RSAContext& operator=(const RSAContext& orig) 
-  {
-    d_context.ver = orig.d_context.ver;
-    d_context.len = orig.d_context.len;
-
-    d_context.padding = orig.d_context.padding;
-    d_context.hash_id = orig.d_context.hash_id;
-    d_context.f_rng = orig.d_context.f_rng;
-    d_context.p_rng = orig.d_context.p_rng;
-    
-    PDNSSEC_MF(N); 
-    PDNSSEC_MF(E); PDNSSEC_MF(D); PDNSSEC_MF(P); PDNSSEC_MF(Q); PDNSSEC_MF(DP); PDNSSEC_MF(DQ); PDNSSEC_MF(QP); PDNSSEC_MF(RN); PDNSSEC_MF(RP); PDNSSEC_MF(RQ);
-    
-    PDNSSEC_MC(N); 
-    PDNSSEC_MC(E); PDNSSEC_MC(D); PDNSSEC_MC(P); PDNSSEC_MC(Q); PDNSSEC_MC(DP); PDNSSEC_MC(DQ); PDNSSEC_MC(QP); PDNSSEC_MC(RN); PDNSSEC_MC(RP); PDNSSEC_MC(RQ);
-    return *this;
-  }
-
-  const rsa_context& getConstContext() const
-  {
-    return d_context;
-  }
-
-  rsa_context& getContext() 
-  {
-    return d_context;
-  }
-
-
-  void create(unsigned int bits);
-  std::string convertToISC(unsigned int algorithm) const;
-  std::string getPubKeyHash();
-private:
-  rsa_context d_context;
-};
-
-// see above
-#undef PDNSSEC_MC
-#undef PDNSSEC_MI
-#undef PDNSSEC_MF
-
-struct DNSSECPrivateKey
-{
-  uint16_t getTag();
-  
-  RSAContext d_key;
-  DNSKEYRecordContent getDNSKEY() const;
-  uint8_t d_algorithm;
-  uint16_t d_flags;
-};
+using namespace ::boost::multi_index;
 
 class DNSSECKeeper
 {