diff --git a/plugins/fishlim/base64.c b/plugins/fishlim/base64.c index e01a3853..0988ecc3 100644 --- a/plugins/fishlim/base64.c +++ b/plugins/fishlim/base64.c @@ -48,7 +48,7 @@ size_t calcDecodeLength(const char *b64input) { //Calculates the length of a dec return (len * 3) / 4 - padding; } -int base64_encode(const unsigned char *buffer, size_t length, char **b64text) { //Encodes a binary safe base 64 string +int openssl_base64_encode(const unsigned char *buffer, size_t length, char **b64text) { //Encodes a binary safe base 64 string BIO *bio, *b64; BUF_MEM *bufferPtr; @@ -70,7 +70,7 @@ int base64_encode(const unsigned char *buffer, size_t length, char **b64text) { return (0); //success } -int base64_decode(const char *b64message, unsigned char **buffer, size_t *length) { //Decodes a base64 encoded string +int openssl_base64_decode(const char *b64message, unsigned char **buffer, size_t *length) { //Decodes a base64 encoded string BIO *bio = NULL, *b64 = NULL; int decodeLen = 0; diff --git a/plugins/fishlim/base64.h b/plugins/fishlim/base64.h index 2e813311..e0d83844 100644 --- a/plugins/fishlim/base64.h +++ b/plugins/fishlim/base64.h @@ -30,7 +30,7 @@ #include -int base64_encode(const unsigned char *buffer, size_t length, char **b64text); -int base64_decode(const char *b64message, unsigned char **buffer, size_t *length); +int openssl_base64_encode(const unsigned char *buffer, size_t length, char **b64text); +int openssl_base64_decode(const char *b64message, unsigned char **buffer, size_t *length); #endif //BASE64_H diff --git a/plugins/fishlim/fish.c b/plugins/fishlim/fish.c index 8f7a5f84..20049e01 100644 --- a/plugins/fishlim/fish.c +++ b/plugins/fishlim/fish.c @@ -284,7 +284,7 @@ char *fish_encrypt(const char *key, size_t keylen, const char *message, size_t m switch (mode) { case FISH_CBC_MODE: - base64_encode((const unsigned char *) ciphertext, ciphertext_len, &b64); + openssl_base64_encode((const unsigned char *) ciphertext, ciphertext_len, &b64); break; case FISH_ECB_MODE: @@ -310,7 +310,7 @@ char *fish_decrypt(const char *key, size_t keylen, const char *data, int mode) { switch (mode) { case FISH_CBC_MODE: - if (base64_decode(data, (unsigned char **) &ciphertext, &ciphertext_len) != 0) + if (openssl_base64_decode(data, (unsigned char **) &ciphertext, &ciphertext_len) != 0) return NULL; break;