9 files changed, 71 insertions, 67 deletions

diff --git a/configure.ac b/configure.ac
index af7a301..2ce5f71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,35 +32,24 @@ if test "${WANT_KONFORKA}" = "yes" ; then
    AC_MSG_RESULT([yes])
    AC_SUBST([KONFORKA_CFLAGS])
    AC_SUBST([KONFORKA_LIBS])
    AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library])
    AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library])
    AC_SUBST([KONFORKA_KONFORKA],[konforka])
   ],[
    AC_MSG_RESULT([no])
   ]
  )
 fi
 
-AC_LANG_PUSH([C++])
- AC_CHECK_LIB([mimetic],[main],[
-   MIMETIC_LIBS=-lmimetic
-   AC_SUBST([MIMETIC_CFLAGS])
-   AC_SUBST([MIMETIC_LIBS])
-  ],[
-   AC_MSG_ERROR([no mimetic library found. get one from http://codesink.org/mimetic_mime_library.html])
-  ]
- )
-AC_LANG_POP([C++])
-
 WANT_DOXYGEN="yes"
 AC_ARG_ENABLE([doxygen],
  AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
  [
   test "${enableval}" = "no" && WANT_DOXYGEN="no"
  ]
 )
 if test "${WANT_DOXYGEN}" = "yes" ; then
  AC_WITH_DOXYGEN
  AC_WITH_DOT
 else
  AM_CONDITIONAL([HAVE_DOXYGEN],[false])
diff --git a/include/opkele/util.h b/include/opkele/util.h
index 5372498..80d8b03 100644
--- a/include/opkele/util.h
+++ b/include/opkele/util.h
@@ -1,22 +1,24 @@
 #ifndef __OPKELE_UTIL_H
 #define __OPKELE_UTIL_H
 
 #include <time.h>
 #include <string>
+#include <vector>
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
 namespace opkele {
     using std::string;
+    using std::vector;
 
     namespace util {
 
         class bignum_t {
             public:
                 BIGNUM *_bn;
 
                 bignum_t() : _bn(0) { }
                 bignum_t(BIGNUM *bn) : _bn(bn) { }
                 ~bignum_t() throw() { if(_bn) BN_free(_bn); }
                 
                 bignum_t& operator=(BIGNUM *bn) { if(_bn) BN_free(_bn); _bn = bn; return *this; }
@@ -43,17 +45,20 @@ namespace opkele {
 
         BIGNUM *base64_to_bignum(const string& b64);
         BIGNUM *dec_to_bignum(const string& dec);
         string bignum_to_base64(const BIGNUM *bn);
 
         string time_to_w3c(time_t t);
         time_t w3c_to_time(const string& w);
 
         string url_encode(const string& str);
 
         string long_to_string(long l);
         long string_to_long(const string& s);
+
+        string encode_base64(const void *data,size_t length);
+        void decode_base64(const string& data,vector<unsigned char>& rv);
     }
 
 }
 
 #endif /* __OPKELE_UTIL_H */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bdadd44..ec63c25 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,25 +1,23 @@
 lib_LTLIBRARIES = libopkele.la
 
 INCLUDES = \
            -I${top_srcdir}/include/ \
            ${KONFORKA_CFLAGS} \
            ${OPENSSL_CFLAGS} \
-           ${MIMETIC_CFLAGS} \
            ${LIBCURL_CPPFLAGS} \
            ${PCREPP_CFLAGS}
 LDADD = \
         ${LIBCURL} \
         ${PCREPP_LIBS} \
-        ${MIMETIC_LIBS} \
         ${OPENSSL_LIBS} \
         ${KONFORKA_LIBS}
 
 libopkele_la_SOURCES = \
                        params.cc \
                        util.cc \
                        server.cc \
                        secret.cc \
                        data.cc \
                        consumer.cc \
                        exception.cc \
                        extension.cc \
diff --git a/lib/consumer.cc b/lib/consumer.cc
index b215aa8..331b1e9 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -1,34 +1,25 @@
 #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); }
@@ -157,29 +148,26 @@ namespace opkele {
         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);
diff --git a/lib/params.cc b/lib/params.cc
index 14f1a53..03867d5 100644
--- a/lib/params.cc
+++ b/lib/params.cc
@@ -1,18 +1,17 @@
 #include <opkele/types.h>
 #include <opkele/exception.h>
 #include <opkele/util.h>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
-#include <mimetic/mimetic.h>
 
 namespace opkele {
     using namespace std;
 
     bool params_t::has_param(const string& n) const {
         return find(n)!=end();
     }
     const string& params_t::get_param(const string& n) const {
         const_iterator i = find(n);
         if(i==end())
             throw failed_lookup(OPKELE_CP_ n+": no such parameter");
         return i->second;
@@ -51,29 +50,25 @@ namespace opkele {
             kv += get_param(f);
             kv += '\n';
             if(co==string::npos)
                 break;
             p = co+1;
         }
         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);
-        mimetic::Base64::Encoder b(0);
-        sig.erase();
-        mimetic::encode(
-                md,md+md_len, b,
-                back_insert_iterator<string>(sig) );
+        sig = util::encode_base64(md,md_len);
     }
 
     string params_t::append_query(const string& url,const char *prefix) const {
         string rv = url;
         bool p = true;
         if(rv.find('?')==string::npos) {
             rv += '?';
             p = false;
         }
         for(const_iterator i=begin();i!=end();++i) {
             if(p)
                 rv += '&';
diff --git a/lib/secret.cc b/lib/secret.cc
index ae8a3c5..632a2ca 100644
--- a/lib/secret.cc
+++ b/lib/secret.cc
@@ -1,61 +1,49 @@
 #include <algorithm>
 #include <functional>
 #include <opkele/types.h>
 #include <opkele/exception.h>
-#include <mimetic/mimetic.h>
+#include <opkele/util.h>
 
 namespace opkele {
     using namespace std;
 
     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");
         vector<unsigned char> tmp;
         transform(
                 begin(), end(),
                 key_sha1,
                 back_insert_iterator<vector<unsigned char> >(tmp),
                 bitwise_xor<unsigned char,unsigned char,unsigned char>() );
-        mimetic::Base64::Encoder b(0);
-        mimetic::encode(
-                tmp.begin(),tmp.end(), b,
-                back_insert_iterator<string>(rv) );
+        rv = util::encode_base64(&(tmp.front()),tmp.size());
     }
 
     void secret_t::enxor_from_base64(const unsigned char *key_sha1,const string& b64) {
-        mimetic::Base64::Decoder b;
         clear();
-        mimetic::decode(
-                b64.begin(),b64.end(), b,
-                back_insert_iterator<secret_t>(*this) );
+        util::decode_base64(b64,*this);
         transform(
                 begin(), end(),
                 key_sha1,
                 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");
-        mimetic::Base64::Encoder b(0);
-        mimetic::encode(
-                begin(),end(), b,
-                back_insert_iterator<string>(rv) );
+        rv = util::encode_base64(&(front()),size());
     }
 
     void secret_t::from_base64(const string& b64) {
-        mimetic::Base64::Decoder b;
-        mimetic::decode(
-                b64.begin(),b64.end(), b,
-                back_insert_iterator<secret_t>(*this) );
+        util::decode_base64(b64,*this);
     }
 
 }
diff --git a/lib/server.cc b/lib/server.cc
index 8c29abb..e81d4b6 100644
--- a/lib/server.cc
+++ b/lib/server.cc
@@ -1,16 +1,15 @@
 #include <vector>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
-#include <mimetic/mimetic.h>
 #include <opkele/util.h>
 #include <opkele/exception.h>
 #include <opkele/server.h>
 #include <opkele/data.h>
 
 namespace opkele {
     using namespace std;
 
     void server_t::associate(const params_t& pin,params_t& pout) {
         util::dh_t dh;
         util::bignum_t c_pub;
         unsigned char key_sha1[SHA_DIGEST_LENGTH];
@@ -104,29 +103,26 @@ namespace opkele {
         /* TODO: eventually remove deprecated stuff */
         time_t now = time(0);
         pout["issued"] = util::time_to_w3c(now);
         pout["valid_to"] = util::time_to_w3c(now+120);
         pout["exipres_in"] = "120";
         pout["signed"]="mode,identity,return_to";
         if(ext) ext->checkid_hook(pin,pout);
         pout.sign(assoc->secret(),pout["sig"],pout["signed"]);
     }
 
     void server_t::check_authentication(const params_t& pin,params_t& pout) {
         vector<unsigned char>  sig;
-        mimetic::Base64::Decoder b;
         const string& sigenc = pin.get_param("openid.sig");
-        mimetic::decode(
-                sigenc.begin(),sigenc.end(), b,
-                back_insert_iterator<vector<unsigned char> >(sig));
+        util::decode_base64(sigenc,sig);
         assoc_t assoc;
         try {
             assoc = retrieve_assoc(pin.get_param("openid.assoc_handle"));
         }catch(failed_lookup& fl) {
             throw failed_assertion(OPKELE_CP_ "invalid handle or handle not specified");
         }
         if(!assoc->stateless())
             throw stateful_handle(OPKELE_CP_ "will not do check_authentication on a stateful handle");
         const string& slist = pin.get_param("openid.signed");
         string kv;
         string::size_type p =0;
         while(true) {
diff --git a/lib/util.cc b/lib/util.cc
index d78b5e0..d9abca7 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -1,58 +1,103 @@
 #include <errno.h>
 #include <cassert>
 #include <vector>
 #include <string>
-#include <mimetic/mimetic.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 #include <curl/curl.h>
 #include "opkele/util.h"
 #include "opkele/exception.h"
 
 namespace opkele {
     using namespace std;
 
     namespace util {
 
         /*
+         * base64
+         */
+        string encode_base64(const void *data,size_t length) {
+            BIO *b64 = 0, *bmem = 0;
+            try {
+                b64 = BIO_new(BIO_f_base64());
+                if(!b64)
+                    throw exception_openssl(OPKELE_CP_ "failed to BIO_new() base64 encoder");
+                BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL);
+                bmem = BIO_new(BIO_s_mem());
+                BIO_set_flags(b64,BIO_CLOSE);
+                if(!bmem)
+                    throw exception_openssl(OPKELE_CP_ "failed to BIO_new() memory buffer");
+                BIO_push(b64,bmem);
+                if(BIO_write(b64,data,length)!=length)
+                    throw exception_openssl(OPKELE_CP_ "failed to BIO_write()");
+                BIO_flush(b64);
+                char *rvd;
+                long rvl = BIO_get_mem_data(bmem,&rvd);
+                string rv(rvd,rvl);
+                BIO_free_all(b64);
+                return rv;
+            }catch(...) {
+                if(b64) BIO_free_all(b64);
+                throw;
+            }
+        }
+
+        void decode_base64(const string& data,vector<unsigned char>& rv) {
+            BIO *b64 = 0, *bmem = 0;
+            rv.clear();
+            try {
+                bmem = BIO_new_mem_buf((void*)data.data(),data.size());
+                if(!bmem)
+                    throw exception_openssl(OPKELE_CP_ "failed to BIO_new_mem_buf()");
+                b64 = BIO_new(BIO_f_base64());
+                if(!b64)
+                    throw exception_openssl(OPKELE_CP_ "failed to BIO_new() base64 decoder");
+                BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL);
+                BIO_push(b64,bmem);
+                unsigned char tmp[512];
+                size_t rb = 0;
+                while((rb=BIO_read(b64,tmp,sizeof(tmp)))>0)
+                    rv.insert(rv.end(),tmp,&tmp[rb]);
+                BIO_free_all(b64);
+            }catch(...) {
+                if(b64) BIO_free_all(b64);
+                throw;
+            }
+        }
+
+        /*
          * big numerics
          */
 
         BIGNUM *base64_to_bignum(const string& b64) {
             vector<unsigned char> bin;
-            mimetic::Base64::Decoder b;
-            mimetic::decode(
-                    b64.begin(),b64.end(), b,
-                    back_insert_iterator<vector<unsigned char> >(bin) );
+            decode_base64(b64,bin);
             BIGNUM *rv = BN_bin2bn(&(bin.front()),bin.size(),0);
             if(!rv)
                 throw failed_conversion(OPKELE_CP_ "failed to BN_bin2bn()");
             return rv;
         }
 
         BIGNUM *dec_to_bignum(const string& dec) {
             BIGNUM *rv = 0;
             if(!BN_dec2bn(&rv,dec.c_str()))
                 throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()");
             return rv;
         }
 
         string bignum_to_base64(const BIGNUM *bn) {
             vector<unsigned char> bin(BN_num_bytes(bn));
             int l = BN_bn2bin(bn,&(bin.front()));
-            string rv;
-            mimetic::Base64::Encoder b(0);
-            mimetic::encode(
-                    bin.begin(),bin.begin()+l, b,
-                    back_insert_iterator<string>(rv) );
-            return rv;
+            return encode_base64(&(bin.front()),l);
         }
 
         /*
          * w3c times
          */
 
         string time_to_w3c(time_t t) {
             struct tm tm_t;
             if(!gmtime_r(&t,&tm_t))
                 throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()");
             char rv[25];
             if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t))
diff --git a/libopkele.pc.in b/libopkele.pc.in
index 60bca34..286720e 100644
--- a/libopkele.pc.in
+++ b/libopkele.pc.in
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
 Name: libopkele
 Description: C++ implementation of OpenID protocol
 Version: @VERSION@
 Requires: openssl @KONFORKA_KONFORKA@
 Cflags: -I${includedir} @LIBCURL_CPPFLAGS@ @PCREPP_CFLAGS@
-Libs: -L${libdir} -lopkele @LIBCURL@ @PCREPP_LIBS@ @MIMETIC_LIBS@
+Libs: -L${libdir} -lopkele @LIBCURL@ @PCREPP_LIBS@