barrysteyn · September 24, 2024 04:37 · May 24, 2015 · May 24, 2015 · May 24, 2015 · May 24, 2015
diff --git a/Base64Decode.c b/Base64Decode.c
@@ -23,7 +23,7 @@ int Base64Decode(char* b64message, unsigned char** buffer, size_t* length) { //D
 
 	int decodeLen = calcDecodeLength(b64message);
 	*buffer = (unsigned char*)malloc(decodeLen + 1);
-	*(buffer)[decodeLen] = '\0';
+	(*buffer)[decodeLen] = '\0';
 
 	bio = BIO_new_mem_buf(b64message, -1);
 	b64 = BIO_new(BIO_f_base64());

diff --git a/Base64Decode.c b/Base64Decode.c
@@ -23,7 +23,7 @@ int Base64Decode(char* b64message, unsigned char** buffer, size_t* length) { //D
 
 	int decodeLen = calcDecodeLength(b64message);
 	*buffer = (unsigned char*)malloc(decodeLen + 1);
-        *(buffer+decodeLen) = '\0';
+	*(buffer)[decodeLen] = '\0';
 
 	bio = BIO_new_mem_buf(b64message, -1);
 	b64 = BIO_new(BIO_f_base64());

diff --git a/Base64Decode.c b/Base64Decode.c
@@ -23,6 +23,7 @@ int Base64Decode(char* b64message, unsigned char** buffer, size_t* length) { //D
 
 	int decodeLen = calcDecodeLength(b64message);
 	*buffer = (unsigned char*)malloc(decodeLen + 1);
+        *(buffer+decodeLen) = '\0';
 
 	bio = BIO_new_mem_buf(b64message, -1);
 	b64 = BIO_new(BIO_f_base64());

diff --git a/Base64Decode.c b/Base64Decode.c
@@ -22,7 +22,7 @@ int Base64Decode(char* b64message, unsigned char** buffer, size_t* length) { //D
 	BIO *bio, *b64;
 
 	int decodeLen = calcDecodeLength(b64message);
-	*buffer = (unsigned char*)malloc(decodeLen);
+	*buffer = (unsigned char*)malloc(decodeLen + 1);
 
 	bio = BIO_new_mem_buf(b64message, -1);
 	b64 = BIO_new(BIO_f_base64());

diff --git a/Base64Decode.c b/Base64Decode.c
@@ -18,11 +18,11 @@ size_t calcDecodeLength(const char* b64input) { //Calculates the length of a dec
 	return (len*3)/4 - padding;
 }
 
-int Base64Decode(char* b64message, uint8_t** buffer, size_t* length) { //Decodes a base64 encoded string
+int Base64Decode(char* b64message, unsigned char** buffer, size_t* length) { //Decodes a base64 encoded string
 	BIO *bio, *b64;
 
 	int decodeLen = calcDecodeLength(b64message);
-	*buffer = (uint8_t*)malloc(decodeLen);
+	*buffer = (unsigned char*)malloc(decodeLen);
 
 	bio = BIO_new_mem_buf(b64message, -1);
 	b64 = BIO_new(BIO_f_base64());

diff --git a/Base64Encode.c b/Base64Encode.c
@@ -4,7 +4,7 @@
 #include <openssl/buffer.h>
 #include <stdint.h>
 
-int Base64Encode(const uint8_t* buffer, size_t length, char** b64text) { //Encodes a binary safe base 64 string
+int Base64Encode(const unsigned char* buffer, size_t length, char** b64text) { //Encodes a binary safe base 64 string
 	BIO *bio, *b64;
 	BUF_MEM *bufferPtr;
 

diff --git a/makeFile → makefile b/makeFile → makefile
diff --git a/Base64Decode.c b/Base64Decode.c
@@ -1,4 +1,6 @@
 //Decodes Base64
+#include <stdio.h>
+#include <string.h>
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <stdint.h>

diff --git a/Main.c b/Main.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 
 int main() {
   //Encode To Base64

diff --git a/MakeFile → makeFile b/MakeFile → makeFile
diff --git a/Base64.md b/Base64.md
@@ -1,4 +1,28 @@
 OpenSSL Base64 Encoding: Binary Safe and Portable
 =================================================
 
-Herewith is an example of encoding to and from base64 using OpenSSL's C library. Code presented here is both binary safe, and portable (i.e. it should work on any Posix compliant system e.g. FreeBSD and Linux).
+Herewith is an example of encoding to and from base64 using OpenSSL's C library. Code presented here is both binary safe, and portable (i.e. it should work on any Posix compliant system e.g. FreeBSD and Linux).
+
+License
+=======
+The MIT License (MIT)
+
+Copyright (c) 2013 Barry Steyn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Base64Decode.c b/Base64Decode.c
@@ -13,7 +13,7 @@ size_t calcDecodeLength(const char* b64input) { //Calculates the length of a dec
 	else if (b64input[len-1] == '=') //last char is =
 		padding = 1;
 
-	return (size_t)len*0.75 - padding;
+	return (len*3)/4 - padding;
 }
 
 int Base64Decode(char* b64message, uint8_t** buffer, size_t* length) { //Decodes a base64 encoded string

diff --git a/Base64 → Base64.md b/Base64 → Base64.md
diff --git a/Base64.md → Base64 b/Base64.md → Base64
diff --git a/.README.md → Base64.md b/.README.md → Base64.md
diff --git a/README.md → .README.md b/README.md → .README.md
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+OpenSSL Base64 Encoding: Binary Safe and Portable
+=================================================
+
+Herewith is an example of encoding to and from base64 using OpenSSL's C library. Code presented here is both binary safe, and portable (i.e. it should work on any Posix compliant system e.g. FreeBSD and Linux).
diff --git a/Base64Decode.c b/Base64Decode.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-size_t calcDecodeLength(const char* b64input) { //Calculates the length of a decoded base64 string
+size_t calcDecodeLength(const char* b64input) { //Calculates the length of a decoded string
 	size_t len = strlen(b64input),
 		padding = 0;
 

diff --git a/Base64Encode.c b/Base64Encode.c
@@ -4,7 +4,7 @@
 #include <openssl/buffer.h>
 #include <stdint.h>
 
-int Base64Encode(const uint8_t* buffer, size_t length, char** b64text) { //Encodes a string to base64
+int Base64Encode(const uint8_t* buffer, size_t length, char** b64text) { //Encodes a binary safe base 64 string
 	BIO *bio, *b64;
 	BUF_MEM *bufferPtr;
 

diff --git a/Base64Decode.c b/Base64Decode.c
@@ -2,6 +2,7 @@
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <stdint.h>
+#include <assert.h>
 
 size_t calcDecodeLength(const char* b64input) { //Calculates the length of a decoded base64 string
 	size_t len = strlen(b64input),
@@ -27,6 +28,7 @@ int Base64Decode(char* b64message, uint8_t** buffer, size_t* length) { //Decodes
 
 	BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL); //Do not use newlines to flush buffer
 	*length = BIO_read(bio, *buffer, strlen(b64message));
+	assert(*length == decodeLen); //length should equal decodeLen, else something went horribly wrong
 	BIO_free_all(bio);
 
 	return (0); //success

diff --git a/Base64Decode.c b/Base64Decode.c
@@ -0,0 +1,33 @@
+//Decodes Base64
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <stdint.h>
+
+size_t calcDecodeLength(const char* b64input) { //Calculates the length of a decoded base64 string
+	size_t len = strlen(b64input),
+		padding = 0;
+
+	if (b64input[len-1] == '=' && b64input[len-2] == '=') //last two chars are =
+		padding = 2;
+	else if (b64input[len-1] == '=') //last char is =
+		padding = 1;
+
+	return (size_t)len*0.75 - padding;
+}
+
+int Base64Decode(char* b64message, uint8_t** buffer, size_t* length) { //Decodes a base64 encoded string
+	BIO *bio, *b64;
+
+	int decodeLen = calcDecodeLength(b64message);
+	*buffer = (uint8_t*)malloc(decodeLen);
+
+	bio = BIO_new_mem_buf(b64message, -1);
+	b64 = BIO_new(BIO_f_base64());
+	bio = BIO_push(b64, bio);
+
+	BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL); //Do not use newlines to flush buffer
+	*length = BIO_read(bio, *buffer, strlen(b64message));
+	BIO_free_all(bio);
+
+	return (0); //success
+}
diff --git a/Base64Encode.c b/Base64Encode.c
@@ -0,0 +1,25 @@
+//Encodes Base64
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
+#include <stdint.h>
+
+int Base64Encode(const uint8_t* buffer, size_t length, char** b64text) { //Encodes a string to base64
+	BIO *bio, *b64;
+	BUF_MEM *bufferPtr;
+
+	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); //Ignore newlines - write everything in one line
+	BIO_write(bio, buffer, length);
+	BIO_flush(bio);
+	BIO_get_mem_ptr(bio, &bufferPtr);
+	BIO_set_close(bio, BIO_NOCLOSE);
+	BIO_free_all(bio);
+
+	*b64text=(*bufferPtr).data;
+
+	return (0); //success
+}
diff --git a/Main.c b/Main.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+
+int main() {
+  //Encode To Base64
+  char* base64EncodeOutput, *text="Hello World";
+
+  Base64Encode(text, strlen(text), &base64EncodeOutput);
+  printf("Output (base64): %s\n", base64EncodeOutput);
+
+  //Decode From Base64
+  char* base64DecodeOutput;
+  size_t test;
+  Base64Decode("SGVsbG8gV29ybGQ=", &base64DecodeOutput, &test);
+  printf("Output: %s %d\n", base64DecodeOutput, test);
+
+  return(0);
+}
diff --git a/MakeFile b/MakeFile
@@ -0,0 +1,2 @@
+all:
+	gcc -o base64 Main.c Base64Encode.c Base64Decode.c -lcrypto -lm -w
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		all:
		gcc -o base64 Main.c Base64Encode.c Base64Decode.c -lcrypto -lm -w