1 files changed, 2 insertions, 14 deletions

diff --git a/lib/consumer.cc b/lib/consumer.cc
index b215aa8..331b1e9 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -1,70 +1,61 @@
 #include <algorithm>
+#include <cassert>
 #include <opkele/util.h>
 #include <opkele/exception.h>
 #include <opkele/data.h>
 #include <opkele/consumer.h>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
-#include <mimetic/mimetic.h>
 #include <curl/curl.h>
 #include <pcre++.h>
 
 #include <iostream>
 
-/* silly mimetic */
-#undef PACKAGE
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef VERSION
-
 #include "config.h"
 
 namespace opkele {
     using namespace std;
 
     class curl_t {
         public:
             CURL *_c;
 
             curl_t() : _c(0) { }
             curl_t(CURL *c) : _c(c) { }
             ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); }
 
             curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; }
 
             operator const CURL*(void) const { return _c; }
             operator CURL*(void) { return _c; }
     };
 
     static CURLcode curl_misc_sets(CURL* c) {
         CURLcode r;
         (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1))
         || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5))
         || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120))
         || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1))
         || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION))
         || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20))
         ;
         return r;
     }
 
     static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) {
         string *str = (string*)stream;
         size_t bytes = size*nmemb;
         size_t get = min(16384-str->length(),bytes);
         str->append((const char*)ptr,get);
         return get;
     }
 
     assoc_t consumer_t::associate(const string& server) {
         util::dh_t dh = DH_new();
         if(!dh)
             throw exception_openssl(OPKELE_CP_ "failed to DH_new()");
         dh->p = util::dec_to_bignum(data::_default_p);
         dh->g = util::dec_to_bignum(data::_default_g);
         if(!DH_generate_key(dh))
             throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()");
         string request = 
@@ -121,101 +112,98 @@ namespace opkele {
         }else
             throw bad_input(OPKELE_CP_ "no expiration information");
         return store_assoc(server,p.get_param("assoc_handle"),secret,expires_in);
     }
 
     string consumer_t::checkid_immediate(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) {
         return checkid_(mode_checkid_immediate,identity,return_to,trust_root,ext);
     }
     string consumer_t::checkid_setup(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) {
         return checkid_(mode_checkid_setup,identity,return_to,trust_root,ext);
     }
     string consumer_t::checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root,extension_t *ext) {
         params_t p;
         if(mode==mode_checkid_immediate)
             p["mode"]="checkid_immediate";
         else if(mode==mode_checkid_setup)
             p["mode"]="checkid_setup";
         else
             throw bad_input(OPKELE_CP_ "unknown checkid_* mode");
         string iurl = canonicalize(identity);
         string server, delegate;
         retrieve_links(iurl,server,delegate);
         p["identity"] = delegate.empty()?iurl:delegate;
         if(!trust_root.empty())
             p["trust_root"] = trust_root;
         p["return_to"] = return_to;
         try {
             try {
                 string ah = find_assoc(server)->handle();
                 p["assoc_handle"] = ah;
             }catch(failed_lookup& fl) {
                 string ah = associate(server)->handle();
                 p["assoc_handle"] = ah;
             }
         }catch(exception& e) { }
         if(ext) ext->checkid_hook(p,identity);
         return p.append_query(server);
     }
 
     void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) {
         if(pin.has_param("openid.user_setup_url"))
             throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url"));
         string server,delegate;
         retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate);
         params_t ps;
         try {
             assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle"));
             const string& sigenc = pin.get_param("openid.sig");
-            mimetic::Base64::Decoder b;
             vector<unsigned char> sig;
-            mimetic::decode(
-                    sigenc.begin(),sigenc.end(), b,
-                    back_insert_iterator<vector<unsigned char> >(sig) );
+            util::decode_base64(sigenc,sig);
             const string& slist = pin.get_param("openid.signed");
             string kv;
             string::size_type p = 0;
             while(true) {
                 string::size_type co = slist.find(',',p);
                 string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p);
                 kv += f;
                 kv += ':';
                 f.insert(0,"openid.");
                 kv += pin.get_param(f);
                 kv += '\n';
                 if(ext) ps[f.substr(sizeof("openid.")-1)] = pin.get_param(f);
                 if(co==string::npos)
                     break;
                 p = co+1;
             }
             secret_t secret = assoc->secret();
             unsigned int md_len = 0;
             unsigned char *md = HMAC(
                     EVP_sha1(),
                     &(secret.front()),secret.size(),
                     (const unsigned char *)kv.data(),kv.length(),
                     0,&md_len);
             if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len))
                 throw id_res_mismatch(OPKELE_CP_ "signature mismatch");
         }catch(failed_lookup& e) { /* XXX: more specific? */
             const string& slist = pin.get_param("openid.signed");
             string::size_type pp = 0;
             params_t p;
             while(true) {
                 string::size_type co = slist.find(',',pp);
                 string f = "openid.";
                 f += (co==string::npos)?slist.substr(pp):slist.substr(pp,co-pp);
                 p[f] = pin.get_param(f);
                 if(co==string::npos)
                     break;
                 pp = co+1;
             }
             p["openid.assoc_handle"] = pin.get_param("openid.assoc_handle");
             p["openid.sig"] = pin.get_param("openid.sig");
             p["openid.signed"] = pin.get_param("openid.signed");
             try {
                 string ih = pin.get_param("openid.invalidate_handle");
                 p["openid.invalidate_handle"] = ih;
             }catch(failed_lookup& fl) { }
             try {
                 check_authentication(server,p);
             }catch(failed_check_authentication& fca) {