Port base64.cc to OpenSSL

diff --git a/pdns/base64.cc b/pdns/base64.cc
index 797b27790456ac1d7ca618f683574fd5f53e2141..996c16e28f4653e00a607fa3393c740fc03426b0 100644 (file)
--- a/pdns/base64.cc
+++ b/pdns/base64.cc
@@ -5,9 +5,12 @@
 #include <boost/scoped_array.hpp>
 #ifdef HAVE_MBEDTLS2
 #include <mbedtls/base64.h>
-#else
+#elif defined(HAVE_MBEDTLS)
 #include <polarssl/base64.h>
 #include "mbedtlscompat.hh"
+#elif defined(HAVE_OPENSSL)
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 #endif
 
 int B64Decode(const std::string& src, std::string& dst)
@@ -19,7 +22,21 @@ int B64Decode(const std::string& src, std::string& dst)
   size_t dlen = ( src.length() * 6 + 7 ) / 8 ;
   size_t olen = 0;
   boost::scoped_array<unsigned char> d( new unsigned char[dlen] );
+#ifdef HAVE_MBEDTLS
   if ( mbedtls_base64_decode( d.get(), dlen, &olen, (const unsigned char*) src.c_str(), src.length() ) == 0 ) {
+#elif defined(HAVE_OPENSSL)
+  BIO *bio, *b64;
+  bio = BIO_new(BIO_s_mem());
+  BIO_write(bio, src.c_str(), src.length());
+  b64 = BIO_new(BIO_f_base64());
+  bio = BIO_push(b64, bio);
+  BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL);
+  olen = BIO_read(b64, d.get(), dlen);
+  BIO_free_all(bio);
+  if (olen > 0) {
+#else
+#error "No base64 implementation found"
+#endif
     dst = std::string( (const char*) d.get(), olen );
     return 0;
   }
@@ -29,11 +46,50 @@ int B64Decode(const std::string& src, std::string& dst)
 std::string Base64Encode (const std::string& src)
 {
   if (!src.empty()) {
-    size_t dlen = ( ( ( src.length() + 2 ) / 3 ) * 4 ) + 1;
     size_t olen = 0;
+#ifdef HAVE_MBEDTLS
+    size_t dlen = ( ( ( src.length() + 2 ) / 3 ) * 4 ) + 1;
     boost::scoped_array<unsigned char> dst( new unsigned char[dlen] );
     if( mbedtls_base64_encode( dst.get(), dlen, &olen, (const unsigned char*) src.c_str(), src.length() ) == 0 )
       return std::string( (const char*) dst.get(), olen );
+#elif defined(HAVE_OPENSSL)
+    BIO *bio, *b64;
+    b64 = BIO_new(BIO_f_base64());
+    bio = BIO_new(BIO_s_mem());
+    bio = BIO_push(b64, bio);
+    BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL);
+    BIO_write(bio, src.c_str(), src.length());
+    BIO_flush(bio);
+    char* pp;
+    std::string out;
+    olen = BIO_get_mem_data(bio, &pp);
+    if (olen > 0) {
+      out = std::string(pp, olen);
+    }
+    BIO_free_all(bio);
+    return out;
+#else
+#error "No base64 implementation found"
+#endif
   }
   return "";
 }
+
+#if 0
+#include <iostream>
+int main() {
+  std::string in = "PowerDNS Test String 1";
+  std::string out = Base64Encode(in);
+  std::cout << out << std::endl;
+  if (out != "UG93ZXJETlMgVGVzdCBTdHJpbmcgMQ==") {
+    std::cerr << "output did not match expected data" << std::endl;
+  }
+  std::string roundtrip;
+  B64Decode(out, roundtrip);
+  std::cout << roundtrip << std::endl;
+  if (roundtrip != in) {
+    std::cerr << "roundtripped data did not match input data" << std::endl;
+  }
+  return 0;
+}
+#endif