made secret_t non-constant size and added params_t::query_string function

1. removed checking that secret_t is exactly 20 bytes, because its size is not
   so constant anymore.
2. added a query_string function that produces a query string suitable for use
   in GET and POST requests. I'm making use of it when performing direct
   request when establishing associations.

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 17 insertions, 8 deletions

diff --git a/lib/params.cc b/lib/params.cc
index ea86d3a..7a572c1 100644
--- a/lib/params.cc
+++ b/lib/params.cc
@@ -94,15 +94,28 @@ namespace opkele {
             rv += prefix;
             rv += i->first;
             rv += '=';
             rv += util::url_encode(i->second);
         }
         return rv;
     }
 
+    string params_t::query_string(const char *prefix) const {
+        string rv;
+        for(const_iterator i=begin();i!=end();++i) {
+            if(!rv.empty())
+                rv += '&';
+            rv += prefix;
+            rv += i->first;
+            rv += '=';
+            rv += util::url_encode(i->second);
+        }
+        return rv;
+    }
+
     ostream& operator << (ostream& o,const params_t& p) {
         for(params_t::const_iterator i=p.begin();i!=p.end();++i)
             o << i->first << ':' << i->second << '\n';
         return o;
     }
 
 }
diff --git a/lib/secret.cc b/lib/secret.cc
index 632a2ca..d538890 100644
--- a/lib/secret.cc
+++ b/lib/secret.cc
@@ -9,41 +9,37 @@ namespace opkele {
 
     template<class __a1,class __a2,class __r>
         struct bitwise_xor : public binary_function<__a1,__a2,__r> {
             __r operator() (const __a1& a1,const __a2& a2) const {
                 return a1^a2;
             }
         };
 
-    void secret_t::enxor_to_base64(const unsigned char *key_sha1,string& rv) const {
-        if(size()!=20)
-            throw bad_input(OPKELE_CP_ "wrong secret size");
+    void secret_t::enxor_to_base64(const unsigned char *key_d,string& rv) const {
         vector<unsigned char> tmp;
         transform(
                 begin(), end(),
-                key_sha1,
+                key_d,
                 back_insert_iterator<vector<unsigned char> >(tmp),
                 bitwise_xor<unsigned char,unsigned char,unsigned char>() );
         rv = util::encode_base64(&(tmp.front()),tmp.size());
     }
 
-    void secret_t::enxor_from_base64(const unsigned char *key_sha1,const string& b64) {
+    void secret_t::enxor_from_base64(const unsigned char *key_d,const string& b64) {
         clear();
         util::decode_base64(b64,*this);
         transform(
                 begin(), end(),
-                key_sha1,
+                key_d,
                 begin(),
                 bitwise_xor<unsigned char,unsigned char,unsigned char>() );
     }
 
     void secret_t::to_base64(string& rv) const {
-        if(size()!=20)
-            throw bad_input(OPKELE_CP_ "wrong secret size");
         rv = util::encode_base64(&(front()),size());
     }
 
     void secret_t::from_base64(const string& b64) {
         util::decode_base64(b64,*this);
     }
 
 }