From 6865f0438aecaa0476ef5cd34aecab0c622fbc33 Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Sun, 17 Mar 2013 13:14:26 -0700
Subject: [PATCH] Renaming Base64Decoder to Base64Converter.

It nows encodes and decodes.
---
 CHANGES       |  6 +++++-
 VERSION       |  2 +-
 src/Base64.cc | 20 ++++++++++----------
 src/Base64.h  |  6 +++---
 src/MIME.cc   |  2 +-
 src/MIME.h    |  2 +-
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/CHANGES b/CHANGES
index e1024cfdfb..cc6bf0c233 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 
-2.1-373 | 2013-03-17 12:58:39 -0700
+2.1-375 | 2013-03-17 13:14:26 -0700
 
   * Add base64 encoding functionality, including new BiFs
 	encode_base64() and encode_base64_custom(). (Bernhard Amann)
@@ -7,6 +7,10 @@
   * Replace call to external "openssl" in extract-certs-pem.bro with
 	that encode_base64(). (Bernhard Amann)
 
+  * Adding a test for extract-certs-pem.pem. (Robin Sommer)
+
+  * Renaming Base64Decoder to Base64Converter. (Robin Sommer)
+    
 2.1-366 | 2013-03-17 12:35:59 -0700
 
   * Correctly handle DNS lookups for software version ranges. (Seth
diff --git a/VERSION b/VERSION
index dea19475d1..14ae5c58d9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-373
+2.1-375
diff --git a/src/Base64.cc b/src/Base64.cc
index 5b3968549a..d953ec3557 100644
--- a/src/Base64.cc
+++ b/src/Base64.cc
@@ -2,10 +2,10 @@
 #include "Base64.h"
 #include <math.h>
 
-int Base64Decoder::default_base64_table[256];
-const string Base64Decoder::default_alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+int Base64Converter::default_base64_table[256];
+const string Base64Converter::default_alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-void Base64Decoder::Encode(int len, const unsigned char* data, int* pblen, char** pbuf)
+void Base64Converter::Encode(int len, const unsigned char* data, int* pblen, char** pbuf)
 	{
 	int blen;
 	char *buf;
@@ -42,7 +42,7 @@ void Base64Decoder::Encode(int len, const unsigned char* data, int* pblen, char*
 	}
 
 
-int* Base64Decoder::InitBase64Table(const string& alphabet)
+int* Base64Converter::InitBase64Table(const string& alphabet)
 	{
 	assert(alphabet.size() == 64);
 
@@ -84,7 +84,7 @@ int* Base64Decoder::InitBase64Table(const string& alphabet)
 
 
 
-Base64Decoder::Base64Decoder(Analyzer* arg_analyzer, const string& arg_alphabet)
+Base64Converter::Base64Converter(Analyzer* arg_analyzer, const string& arg_alphabet)
 	{
 	if ( arg_alphabet.size() > 0 )
 		{
@@ -103,13 +103,13 @@ Base64Decoder::Base64Decoder(Analyzer* arg_analyzer, const string& arg_alphabet)
 	analyzer = arg_analyzer;
 	}
 
-Base64Decoder::~Base64Decoder()
+Base64Converter::~Base64Converter()
 	{
 	if ( base64_table != default_base64_table )
 		delete base64_table;
 	}
 
-int Base64Decoder::Decode(int len, const char* data, int* pblen, char** pbuf)
+int Base64Converter::Decode(int len, const char* data, int* pblen, char** pbuf)
 	{
 	int blen;
 	char* buf;
@@ -199,7 +199,7 @@ int Base64Decoder::Decode(int len, const char* data, int* pblen, char** pbuf)
 	return dlen;
 	}
 
-int Base64Decoder::Done(int* pblen, char** pbuf)
+int Base64Converter::Done(int* pblen, char** pbuf)
 	{
 	const char* padding = "===";
 
@@ -231,7 +231,7 @@ BroString* decode_base64(const BroString* s, const BroString* a)
 	int rlen2, rlen = buf_len;
 	char* rbuf2, *rbuf = new char[rlen];
 
-	Base64Decoder dec(0, a ? a->CheckString() : "");
+	Base64Converter dec(0, a ? a->CheckString() : "");
 	if ( dec.Decode(s->Len(), (const char*) s->Bytes(), &rlen, &rbuf) == -1 )
 		goto err;
 
@@ -261,7 +261,7 @@ BroString* encode_base64(const BroString* s, const BroString* a)
 
 	char* outbuf = 0;
 	int outlen = 0;
-	Base64Decoder enc(0, a ? a->CheckString() : "");
+	Base64Converter enc(0, a ? a->CheckString() : "");
 	enc.Encode(s->Len(), (const unsigned char*) s->Bytes(), &outlen, &outbuf);
 
 	return new BroString(1, (u_char*)outbuf, outlen);
diff --git a/src/Base64.h b/src/Base64.h
index 8926a6d096..8cfeffde74 100644
--- a/src/Base64.h
+++ b/src/Base64.h
@@ -10,13 +10,13 @@
 #include "Analyzer.h"
 
 // Maybe we should have a base class for generic decoders?
-class Base64Decoder {
+class Base64Converter {
 public:
 	// <analyzer> is used for error reporting, and it should be zero when
 	// the decoder is called by the built-in function decode_base64() or encode_base64().
 	// Empty alphabet indicates the default base64 alphabet.
-	Base64Decoder(Analyzer* analyzer, const string& alphabet = "");
-	~Base64Decoder();
+	Base64Converter(Analyzer* analyzer, const string& alphabet = "");
+	~Base64Converter();
 
 	// A note on Decode():
 	//
diff --git a/src/MIME.cc b/src/MIME.cc
index 4a7c0268b0..ce60e74b89 100644
--- a/src/MIME.cc
+++ b/src/MIME.cc
@@ -810,7 +810,7 @@ void MIME_Entity::StartDecodeBase64()
 	if ( base64_decoder )
 		reporter->InternalError("previous Base64 decoder not released!");
 
-	base64_decoder = new Base64Decoder(message->GetAnalyzer());
+	base64_decoder = new Base64Converter(message->GetAnalyzer());
 	}
 
 void MIME_Entity::FinishDecodeBase64()
diff --git a/src/MIME.h b/src/MIME.h
index ffff30e387..17ac7fde9f 100644
--- a/src/MIME.h
+++ b/src/MIME.h
@@ -163,7 +163,7 @@ protected:
 	MIME_Entity* parent;
 	MIME_Entity* current_child_entity;
 
-	Base64Decoder* base64_decoder;
+	Base64Converter* base64_decoder;
 
 	int data_buf_length;
 	char* data_buf_data;