From 24c52f1c2e6a9726142bc816a79339e99bebd862 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Tue, 2 Jul 2019 17:47:34 +0200 Subject: [PATCH] Add b64 to string helper in CryptoCore --- core/bind/core_bind.cpp | 42 ++++++--------------------------------- core/math/crypto_core.cpp | 11 ++++++++++ core/math/crypto_core.h | 1 + 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 382ab31f6d8..1bf3425d506 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -2432,16 +2432,8 @@ String _Marshalls::variant_to_base64(const Variant &p_var, bool p_full_objects) err = encode_variant(p_var, &w[0], len, p_full_objects); ERR_FAIL_COND_V(err != OK, ""); - int b64len = len / 3 * 4 + 4 + 1; - PoolVector b64buff; - b64buff.resize(b64len); - PoolVector::Write w64 = b64buff.write(); - - size_t strlen = 0; - ERR_FAIL_COND_V(CryptoCore::b64_encode(&w64[0], b64len, &strlen, &w[0], len) != OK, String()); - //OS::get_singleton()->print("len is %i, vector size is %i\n", b64len, strlen); - w64[strlen] = 0; - String ret = (char *)&w64[0]; + String ret = CryptoCore::b64_encode_str(&w[0], len); + ERR_FAIL_COND_V(ret == "", ret); return ret; }; @@ -2467,19 +2459,8 @@ Variant _Marshalls::base64_to_variant(const String &p_str, bool p_allow_objects) String _Marshalls::raw_to_base64(const PoolVector &p_arr) { - int len = p_arr.size(); - PoolVector::Read r = p_arr.read(); - - int b64len = len / 3 * 4 + 4 + 1; - PoolVector b64buff; - b64buff.resize(b64len); - PoolVector::Write w64 = b64buff.write(); - - size_t strlen = 0; - ERR_FAIL_COND_V(CryptoCore::b64_encode(&w64[0], b64len, &strlen, &r[0], len) != OK, String()); - w64[strlen] = 0; - String ret = (char *)&w64[0]; - + String ret = CryptoCore::b64_encode_str(p_arr.read().ptr(), p_arr.size()); + ERR_FAIL_COND_V(ret == "", ret); return ret; }; @@ -2504,19 +2485,8 @@ PoolVector _Marshalls::base64_to_raw(const String &p_str) { String _Marshalls::utf8_to_base64(const String &p_str) { CharString cstr = p_str.utf8(); - int len = cstr.length(); - - int b64len = len / 3 * 4 + 4 + 1; - PoolVector b64buff; - b64buff.resize(b64len); - PoolVector::Write w64 = b64buff.write(); - - size_t strlen = 0; - ERR_FAIL_COND_V(CryptoCore::b64_encode(&w64[0], b64len, &strlen, (unsigned char *)cstr.get_data(), len) != OK, String()); - - w64[strlen] = 0; - String ret = (char *)&w64[0]; - + String ret = CryptoCore::b64_encode_str((unsigned char *)cstr.get_data(), cstr.length()); + ERR_FAIL_COND_V(ret == "", ret); return ret; }; diff --git a/core/math/crypto_core.cpp b/core/math/crypto_core.cpp index 6449d94db8b..d7ba54e469e 100644 --- a/core/math/crypto_core.cpp +++ b/core/math/crypto_core.cpp @@ -120,6 +120,17 @@ Error CryptoCore::AESContext::decrypt_ecb(const uint8_t p_src[16], uint8_t r_dst } // CryptoCore +String CryptoCore::b64_encode_str(const uint8_t *p_src, int p_src_len) { + int b64len = p_src_len / 3 * 4 + 4 + 1; + PoolVector b64buff; + b64buff.resize(b64len); + PoolVector::Write w64 = b64buff.write(); + size_t strlen = 0; + int ret = b64_encode(&w64[0], b64len, &strlen, p_src, p_src_len); + w64[strlen] = 0; + return ret ? String() : (const char *)&w64[0]; +} + Error CryptoCore::b64_encode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len) { int ret = mbedtls_base64_encode(r_dst, p_dst_len, r_len, p_src, p_src_len); return ret ? FAILED : OK; diff --git a/core/math/crypto_core.h b/core/math/crypto_core.h index 1cb3c86e186..e28cb5a7927 100644 --- a/core/math/crypto_core.h +++ b/core/math/crypto_core.h @@ -79,6 +79,7 @@ public: Error decrypt_ecb(const uint8_t p_src[16], uint8_t r_dst[16]); }; + static String b64_encode_str(const uint8_t *p_src, int p_src_len); static Error b64_encode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len); static Error b64_decode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len);