summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/bind/core_bind.cpp43
-rw-r--r--core/bind/core_bind.h4
-rw-r--r--core/io/aes256.cpp359
-rw-r--r--core/io/aes256.h46
-rw-r--r--core/io/file_access_encrypted.cpp217
-rw-r--r--core/io/file_access_encrypted.h63
-rw-r--r--core/io/marshalls.cpp100
-rw-r--r--core/math/math_2d.h8
-rw-r--r--core/object_type_db.cpp2
-rw-r--r--core/variant.cpp13
-rw-r--r--core/variant_call.cpp2
11 files changed, 851 insertions, 6 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index e3360a23d2..fd6a91d125 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -4,6 +4,7 @@
#include "io/marshalls.h"
#include "io/base64.h"
#include "core/globals.h"
+#include "io/file_access_encrypted.h"
_ResourceLoader *_ResourceLoader::singleton=NULL;
@@ -812,6 +813,44 @@ _Geometry::_Geometry() {
///////////////////////// FILE
+
+Error _File::open_encrypted(const String& p_path, int p_mode_flags,const Vector<uint8_t>& p_key) {
+
+ Error err = open(p_path,p_mode_flags);
+ if (err)
+ return err;
+
+ FileAccessEncrypted *fae = memnew( FileAccessEncrypted );
+ err = fae->open_and_parse(f,p_key,(p_mode_flags==WRITE)?FileAccessEncrypted::MODE_WRITE_AES256:FileAccessEncrypted::MODE_READ);
+ if (err) {
+ memdelete(fae);
+ close();
+ return err;
+ }
+ f=fae;
+ return OK;
+}
+
+Error _File::open_encrypted_pass(const String& p_path, int p_mode_flags,const String& p_pass) {
+
+ Error err = open(p_path,p_mode_flags);
+ if (err)
+ return err;
+
+ FileAccessEncrypted *fae = memnew( FileAccessEncrypted );
+ err = fae->open_and_parse_password(f,p_pass,(p_mode_flags==WRITE)?FileAccessEncrypted::MODE_WRITE_AES256:FileAccessEncrypted::MODE_READ);
+ if (err) {
+ memdelete(fae);
+ close();
+ return err;
+ }
+
+ f=fae;
+ return OK;
+
+}
+
+
Error _File::open(const String& p_path, int p_mode_flags) {
close();
@@ -1113,6 +1152,10 @@ Variant _File::get_var() const {
void _File::_bind_methods() {
+
+ ObjectTypeDB::bind_method(_MD("open_encrypted","path","mode_flags","key"),&_File::open_encrypted);
+ ObjectTypeDB::bind_method(_MD("open_encrypted_with_pass","path","mode_flags","pass"),&_File::open_encrypted_pass);
+
ObjectTypeDB::bind_method(_MD("open","path","flags"),&_File::open);
ObjectTypeDB::bind_method(_MD("close"),&_File::close);
ObjectTypeDB::bind_method(_MD("is_open"),&_File::is_open);
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 0084726547..f5c94dcf06 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -243,6 +243,10 @@ public:
READ_WRITE=3,
};
+ Error open_encrypted(const String& p_path, int p_mode_flags,const Vector<uint8_t>& p_key);
+ Error open_encrypted_pass(const String& p_path, int p_mode_flags,const String& p_pass);
+
+
Error open(const String& p_path, int p_mode_flags); ///< open a file
void close(); ///< close a file
bool is_open() const; ///< true when file is open
diff --git a/core/io/aes256.cpp b/core/io/aes256.cpp
new file mode 100644
index 0000000000..69a5091f1d
--- /dev/null
+++ b/core/io/aes256.cpp
@@ -0,0 +1,359 @@
+/*
+* Byte-oriented AES-256 implementation.
+* All lookup tables replaced with 'on the fly' calculations.
+*
+* Copyright (c) 2007-2009 Ilya O. Levin, http://www.literatecode.com
+* Other contributors: Hal Finney
+*
+* Permission to use, copy, modify, and distribute this software for any
+* purpose with or without fee is hereby granted, provided that the above
+* copyright notice and this permission notice appear in all copies.
+*
+* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+#include "aes256.h"
+
+#define F(x) (((x)<<1) ^ ((((x)>>7) & 1) * 0x1b))
+#define FD(x) (((x) >> 1) ^ (((x) & 1) ? 0x8d : 0))
+
+// #define BACK_TO_TABLES
+#ifdef BACK_TO_TABLES
+
+const uint8_t sbox[256] = {
+ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
+ 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+ 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+ 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+ 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
+ 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+ 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
+ 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+ 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+ 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+ 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
+ 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+ 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
+ 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+ 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+ 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+ 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
+ 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+ 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
+ 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+ 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+ 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+ 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
+ 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+ 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
+ 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+ 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+ 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+ 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
+ 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+ 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
+ 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
+};
+const uint8_t sboxinv[256] = {
+ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38,
+ 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
+ 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
+ 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
+ 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d,
+ 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+ 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2,
+ 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
+ 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
+ 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
+ 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda,
+ 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+ 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a,
+ 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
+ 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
+ 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
+ 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea,
+ 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+ 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85,
+ 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
+ 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
+ 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
+ 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20,
+ 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+ 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31,
+ 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
+ 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
+ 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
+ 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0,
+ 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+ 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26,
+ 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
+};
+
+#define rj_sbox(x) sbox[(x)]
+#define rj_sbox_inv(x) sboxinv[(x)]
+
+#else /* tableless subroutines */
+
+/* -------------------------------------------------------------------------- */
+uint8_t gf_alog(uint8_t x) // calculate anti-logarithm gen 3
+{
+ uint8_t atb = 1, z;
+
+ while (x--) {z = atb; atb <<= 1; if (z & 0x80) atb^= 0x1b; atb ^= z;}
+
+ return atb;
+} /* gf_alog */
+
+/* -------------------------------------------------------------------------- */
+uint8_t gf_log(uint8_t x) // calculate logarithm gen 3
+{
+ uint8_t atb = 1, i = 0, z;
+
+ do {
+ if (atb == x) break;
+ z = atb; atb <<= 1; if (z & 0x80) atb^= 0x1b; atb ^= z;
+ } while (++i > 0);
+
+ return i;
+} /* gf_log */
+
+
+/* -------------------------------------------------------------------------- */
+uint8_t gf_mulinv(uint8_t x) // calculate multiplicative inverse
+{
+ return (x) ? gf_alog(255 - gf_log(x)) : 0;
+} /* gf_mulinv */
+
+/* -------------------------------------------------------------------------- */
+uint8_t rj_sbox(uint8_t x)
+{
+ uint8_t y, sb;
+
+ sb = y = gf_mulinv(x);
+ y = (y<<1)|(y>>7); sb ^= y; y = (y<<1)|(y>>7); sb ^= y;
+ y = (y<<1)|(y>>7); sb ^= y; y = (y<<1)|(y>>7); sb ^= y;
+
+ return (sb ^ 0x63);
+} /* rj_sbox */
+
+/* -------------------------------------------------------------------------- */
+uint8_t rj_sbox_inv(uint8_t x)
+{
+ uint8_t y, sb;
+
+ y = x ^ 0x63;
+ sb = y = (y<<1)|(y>>7);
+ y = (y<<2)|(y>>6); sb ^= y; y = (y<<3)|(y>>5); sb ^= y;
+
+ return gf_mulinv(sb);
+} /* rj_sbox_inv */
+
+#endif
+
+/* -------------------------------------------------------------------------- */
+uint8_t rj_xtime(uint8_t x)
+{
+ return (x & 0x80) ? ((x << 1) ^ 0x1b) : (x << 1);
+} /* rj_xtime */
+
+/* -------------------------------------------------------------------------- */
+void aes_subBytes(uint8_t *buf)
+{
+ register uint8_t i = 16;
+
+ while (i--) buf[i] = rj_sbox(buf[i]);
+} /* aes_subBytes */
+
+/* -------------------------------------------------------------------------- */
+void aes_subBytes_inv(uint8_t *buf)
+{
+ register uint8_t i = 16;
+
+ while (i--) buf[i] = rj_sbox_inv(buf[i]);
+} /* aes_subBytes_inv */
+
+/* -------------------------------------------------------------------------- */
+void aes_addRoundKey(uint8_t *buf, uint8_t *key)
+{
+ register uint8_t i = 16;
+
+ while (i--) buf[i] ^= key[i];
+} /* aes_addRoundKey */
+
+/* -------------------------------------------------------------------------- */
+void aes_addRoundKey_cpy(uint8_t *buf, uint8_t *key, uint8_t *cpk)
+{
+ register uint8_t i = 16;
+
+ while (i--) buf[i] ^= (cpk[i] = key[i]), cpk[16+i] = key[16 + i];
+} /* aes_addRoundKey_cpy */
+
+
+/* -------------------------------------------------------------------------- */
+void aes_shiftRows(uint8_t *buf)
+{
+ register uint8_t i, j; /* to make it potentially parallelable :) */
+
+ i = buf[1]; buf[1] = buf[5]; buf[5] = buf[9]; buf[9] = buf[13]; buf[13] = i;
+ i = buf[10]; buf[10] = buf[2]; buf[2] = i;
+ j = buf[3]; buf[3] = buf[15]; buf[15] = buf[11]; buf[11] = buf[7]; buf[7] = j;
+ j = buf[14]; buf[14] = buf[6]; buf[6] = j;
+
+} /* aes_shiftRows */
+
+/* -------------------------------------------------------------------------- */
+void aes_shiftRows_inv(uint8_t *buf)
+{
+ register uint8_t i, j; /* same as above :) */
+
+ i = buf[1]; buf[1] = buf[13]; buf[13] = buf[9]; buf[9] = buf[5]; buf[5] = i;
+ i = buf[2]; buf[2] = buf[10]; buf[10] = i;
+ j = buf[3]; buf[3] = buf[7]; buf[7] = buf[11]; buf[11] = buf[15]; buf[15] = j;
+ j = buf[6]; buf[6] = buf[14]; buf[14] = j;
+
+} /* aes_shiftRows_inv */
+
+/* -------------------------------------------------------------------------- */
+void aes_mixColumns(uint8_t *buf)
+{
+ register uint8_t i, a, b, c, d, e;
+
+ for (i = 0; i < 16; i += 4)
+ {
+ a = buf[i]; b = buf[i + 1]; c = buf[i + 2]; d = buf[i + 3];
+ e = a ^ b ^ c ^ d;
+ buf[i] ^= e ^ rj_xtime(a^b); buf[i+1] ^= e ^ rj_xtime(b^c);
+ buf[i+2] ^= e ^ rj_xtime(c^d); buf[i+3] ^= e ^ rj_xtime(d^a);
+ }
+} /* aes_mixColumns */
+
+/* -------------------------------------------------------------------------- */
+void aes_mixColumns_inv(uint8_t *buf)
+{
+ register uint8_t i, a, b, c, d, e, x, y, z;
+
+ for (i = 0; i < 16; i += 4)
+ {
+ a = buf[i]; b = buf[i + 1]; c = buf[i + 2]; d = buf[i + 3];
+ e = a ^ b ^ c ^ d;
+ z = rj_xtime(e);
+ x = e ^ rj_xtime(rj_xtime(z^a^c)); y = e ^ rj_xtime(rj_xtime(z^b^d));
+ buf[i] ^= x ^ rj_xtime(a^b); buf[i+1] ^= y ^ rj_xtime(b^c);
+ buf[i+2] ^= x ^ rj_xtime(c^d); buf[i+3] ^= y ^ rj_xtime(d^a);
+ }
+} /* aes_mixColumns_inv */
+
+/* -------------------------------------------------------------------------- */
+void aes_expandEncKey(uint8_t *k, uint8_t *rc)
+{
+ register uint8_t i;
+
+ k[0] ^= rj_sbox(k[29]) ^ (*rc);
+ k[1] ^= rj_sbox(k[30]);
+ k[2] ^= rj_sbox(k[31]);
+ k[3] ^= rj_sbox(k[28]);
+ *rc = F( *rc);
+
+ for(i = 4; i < 16; i += 4) k[i] ^= k[i-4], k[i+1] ^= k[i-3],
+ k[i+2] ^= k[i-2], k[i+3] ^= k[i-1];
+ k[16] ^= rj_sbox(k[12]);
+ k[17] ^= rj_sbox(k[13]);
+ k[18] ^= rj_sbox(k[14]);
+ k[19] ^= rj_sbox(k[15]);
+
+ for(i = 20; i < 32; i += 4) k[i] ^= k[i-4], k[i+1] ^= k[i-3],
+ k[i+2] ^= k[i-2], k[i+3] ^= k[i-1];
+
+} /* aes_expandEncKey */
+
+/* -------------------------------------------------------------------------- */
+void aes_expandDecKey(uint8_t *k, uint8_t *rc)
+{
+ uint8_t i;
+
+ for(i = 28; i > 16; i -= 4) k[i+0] ^= k[i-4], k[i+1] ^= k[i-3],
+ k[i+2] ^= k[i-2], k[i+3] ^= k[i-1];
+
+ k[16] ^= rj_sbox(k[12]);
+ k[17] ^= rj_sbox(k[13]);
+ k[18] ^= rj_sbox(k[14]);
+ k[19] ^= rj_sbox(k[15]);
+
+ for(i = 12; i > 0; i -= 4) k[i+0] ^= k[i-4], k[i+1] ^= k[i-3],
+ k[i+2] ^= k[i-2], k[i+3] ^= k[i-1];
+
+ *rc = FD(*rc);
+ k[0] ^= rj_sbox(k[29]) ^ (*rc);
+ k[1] ^= rj_sbox(k[30]);
+ k[2] ^= rj_sbox(k[31]);
+ k[3] ^= rj_sbox(k[28]);
+} /* aes_expandDecKey */
+
+
+/* -------------------------------------------------------------------------- */
+void aes256_init(aes256_context *ctx, uint8_t *k)
+{
+ uint8_t rcon = 1;
+ register uint8_t i;
+
+ for (i = 0; i < sizeof(ctx->key); i++) ctx->enckey[i] = ctx->deckey[i] = k[i];
+ for (i = 8;--i;) aes_expandEncKey(ctx->deckey, &rcon);
+} /* aes256_init */
+
+/* -------------------------------------------------------------------------- */
+void aes256_done(aes256_context *ctx)
+{
+ register uint8_t i;
+
+ for (i = 0; i < sizeof(ctx->key); i++)
+ ctx->key[i] = ctx->enckey[i] = ctx->deckey[i] = 0;
+} /* aes256_done */
+
+/* -------------------------------------------------------------------------- */
+void aes256_encrypt_ecb(aes256_context *ctx, uint8_t *buf)
+{
+ uint8_t i, rcon;
+
+ aes_addRoundKey_cpy(buf, ctx->enckey, ctx->key);
+ for(i = 1, rcon = 1; i < 14; ++i)
+ {
+ aes_subBytes(buf);
+ aes_shiftRows(buf);
+ aes_mixColumns(buf);
+ if( i & 1 ) aes_addRoundKey( buf, &ctx->key[16]);
+ else aes_expandEncKey(ctx->key, &rcon), aes_addRoundKey(buf, ctx->key);
+ }
+ aes_subBytes(buf);
+ aes_shiftRows(buf);
+ aes_expandEncKey(ctx->key, &rcon);
+ aes_addRoundKey(buf, ctx->key);
+} /* aes256_encrypt */
+
+/* -------------------------------------------------------------------------- */
+void aes256_decrypt_ecb(aes256_context *ctx, uint8_t *buf)
+{
+ uint8_t i, rcon;
+
+ aes_addRoundKey_cpy(buf, ctx->deckey, ctx->key);
+ aes_shiftRows_inv(buf);
+ aes_subBytes_inv(buf);
+
+ for (i = 14, rcon = 0x80; --i;)
+ {
+ if( ( i & 1 ) )
+ {
+ aes_expandDecKey(ctx->key, &rcon);
+ aes_addRoundKey(buf, &ctx->key[16]);
+ }
+ else aes_addRoundKey(buf, ctx->key);
+ aes_mixColumns_inv(buf);
+ aes_shiftRows_inv(buf);
+ aes_subBytes_inv(buf);
+ }
+ aes_addRoundKey( buf, ctx->key);
+} /* aes256_decrypt */
diff --git a/core/io/aes256.h b/core/io/aes256.h
new file mode 100644
index 0000000000..180352e970
--- /dev/null
+++ b/core/io/aes256.h
@@ -0,0 +1,46 @@
+/*
+* Byte-oriented AES-256 implementation.
+* All lookup tables replaced with 'on the fly' calculations.
+*
+* Copyright (c) 2007-2009 Ilya O. Levin, http://www.literatecode.com
+* Other contributors: Hal Finney
+*
+* Permission to use, copy, modify, and distribute this software for any
+* purpose with or without fee is hereby granted, provided that the above
+* copyright notice and this permission notice appear in all copies.
+*
+* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#ifndef AES_256_H
+#define AES_256_H
+
+#include "typedefs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ typedef struct {
+ uint8_t key[32];
+ uint8_t enckey[32];
+ uint8_t deckey[32];
+ } aes256_context;
+
+
+ void aes256_init(aes256_context *, uint8_t * /* key */);
+ void aes256_done(aes256_context *);
+ void aes256_encrypt_ecb(aes256_context *, uint8_t * /* plaintext */);
+ void aes256_decrypt_ecb(aes256_context *, uint8_t * /* cipertext */);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp
new file mode 100644
index 0000000000..49487d4f8f
--- /dev/null
+++ b/core/io/file_access_encrypted.cpp
@@ -0,0 +1,217 @@
+#include "file_access_encrypted.h"
+#include "aes256.h"
+#include "md5.h"
+#include "os/copymem.h"
+#define COMP_MAGIC 0x43454447
+
+
+Error FileAccessEncrypted::open_and_parse(FileAccess *p_base,const Vector<uint8_t>& p_key,Mode p_mode) {
+
+ ERR_FAIL_COND_V(file!=NULL,ERR_ALREADY_IN_USE);
+
+ if (p_mode==MODE_WRITE_AES256) {
+
+ ERR_FAIL_COND_V(p_key.size()!=32,ERR_INVALID_PARAMETER);
+ data.clear();
+ writing=true;
+ file=p_base;
+ mode=p_mode;
+ key=p_key;
+
+ }
+
+ return OK;
+}
+
+Error FileAccessEncrypted::open_and_parse_password(FileAccess *p_base,const String& p_key,Mode p_mode){
+
+
+ String cs = p_key.md5_text();
+ ERR_FAIL_COND_V(cs.length()!=32,ERR_INVALID_PARAMETER);
+ Vector<uint8_t> key;
+ key.resize(32);
+ for(int i=0;i<32;i++) {
+
+ key[i]=cs[i];
+ }
+
+ return open_and_parse(p_base,key,p_mode);
+}
+
+
+
+Error FileAccessEncrypted::_open(const String& p_path, int p_mode_flags) {
+
+ return OK;
+}
+void FileAccessEncrypted::close() {
+
+ if (!file)
+ return;
+
+ if (writing) {
+
+ Vector<uint8_t> compressed;
+ size_t len = data.size();
+ if (len % 16) {
+ len+=16-(len % 16);
+ }
+
+ compressed.resize(len);
+ zeromem( compressed.ptr(), len );
+ for(int i=0;i<data.size();i++) {
+ compressed[i]=data[i];
+ }
+
+ aes256_context ctx;
+ aes256_init(&ctx,key.ptr());
+
+ for(size_t i=0;i<len;i+=16) {
+
+ aes256_encrypt_ecb(&ctx,&compressed[i]);
+ }
+
+ aes256_done(&ctx);
+
+ file->store_32(COMP_MAGIC);
+ file->store_32(mode);
+
+ MD5_CTX md5;
+ MD5Init(&md5);
+ MD5Update(&md5,compressed.ptr(),compressed.size());
+ MD5Final(&md5);
+
+ file->store_buffer(md5.digest,16);
+ file->store_64(data.size());
+
+ file->store_buffer(compressed.ptr(),compressed.size());
+ file->close();
+ memdelete(file);
+ file=NULL;
+
+ }
+
+}
+
+bool FileAccessEncrypted::is_open() const{
+
+ return file!=NULL;
+}
+
+void FileAccessEncrypted::seek(size_t p_position){
+
+ if (writing) {
+ if (p_position > (size_t)data.size())
+ p_position=data.size();
+
+ pos=p_position;
+ }
+}
+
+
+void FileAccessEncrypted::seek_end(int64_t p_position){
+
+ seek( data.size() + p_position );
+}
+size_t FileAccessEncrypted::get_pos() const{
+
+ return pos;
+ return 0;
+}
+size_t FileAccessEncrypted::get_len() const{
+
+ if (writing)
+ return data.size();
+ return 0;
+}
+
+bool FileAccessEncrypted::eof_reached() const{
+
+ if (!writing) {
+
+
+ }
+
+ return false;
+}
+
+uint8_t FileAccessEncrypted::get_8() const{
+
+ return 0;
+}
+int FileAccessEncrypted::get_buffer(uint8_t *p_dst, int p_length) const{
+
+
+ return 0;
+}
+
+Error FileAccessEncrypted::get_error() const{
+
+ return OK;
+}
+
+void FileAccessEncrypted::store_buffer(const uint8_t *p_src,int p_length) {
+
+ ERR_FAIL_COND(!writing);
+
+ if (pos<data.size()) {
+
+ for(int i=0;i<p_length;i++) {
+
+ store_8(p_src[i]);
+ }
+ } else if (pos==data.size()) {
+
+ data.resize(pos+p_length);
+ for(int i=0;i<p_length;i++) {
+
+ data[pos+i]=p_src[i];
+ }
+ pos+=p_length;
+ }
+}
+
+
+void FileAccessEncrypted::store_8(uint8_t p_dest){
+
+ ERR_FAIL_COND(!writing);
+
+ if (pos<data.size()) {
+ data[pos]=p_dest;
+ pos++;
+ } else if (pos==data.size()){
+ data.push_back(p_dest);
+ pos++;
+ }
+}
+
+bool FileAccessEncrypted::file_exists(const String& p_name){
+
+ FileAccess *fa = FileAccess::open(p_name,FileAccess::READ);
+ if (!fa)
+ return false;
+ memdelete(fa);
+ return true;
+}
+
+uint64_t FileAccessEncrypted::_get_modified_time(const String& p_file){
+
+
+ return 0;
+}
+
+FileAccessEncrypted::FileAccessEncrypted() {
+
+ file=NULL;
+}
+
+
+FileAccessEncrypted::~FileAccessEncrypted() {
+
+ if (file)
+ close();
+
+ if (file) {
+ memdelete(file);
+ }
+}
diff --git a/core/io/file_access_encrypted.h b/core/io/file_access_encrypted.h
new file mode 100644
index 0000000000..90796eb2e9
--- /dev/null
+++ b/core/io/file_access_encrypted.h
@@ -0,0 +1,63 @@
+#ifndef FILE_ACCESS_ENCRYPTED_H
+#define FILE_ACCESS_ENCRYPTED_H
+
+
+#include "os/file_access.h"
+
+class FileAccessEncrypted : public FileAccess {
+public:
+
+ enum Mode {
+ MODE_READ,
+ MODE_WRITE_AES256
+ };
+
+private:
+
+
+ Mode mode;
+ Vector<uint8_t> key;
+ bool writing;
+ FileAccess *file;
+ size_t base;
+ size_t length;
+ Vector<uint8_t> data;
+ size_t pos;
+
+
+public:
+
+
+
+
+ Error open_and_parse(FileAccess *p_base,const Vector<uint8_t>& p_key,Mode p_mode);
+ Error open_and_parse_password(FileAccess *p_base,const String& p_key,Mode p_mode);
+
+ virtual Error _open(const String& p_path, int p_mode_flags); ///< open a file
+ virtual void close(); ///< close a file
+ virtual bool is_open() const; ///< true when file is open
+
+ virtual void seek(size_t p_position); ///< seek to a given position
+ virtual void seek_end(int64_t p_position=0); ///< seek from the end of file
+ virtual size_t get_pos() const; ///< get position in the file
+ virtual size_t get_len() const; ///< get size of the file
+
+ virtual bool eof_reached() const; ///< reading passed EOF
+
+ virtual uint8_t get_8() const; ///< get a byte
+ virtual int get_buffer(uint8_t *p_dst, int p_length) const;
+
+ virtual Error get_error() const; ///< get last error
+
+ virtual void store_8(uint8_t p_dest); ///< store a byte
+ virtual void store_buffer(const uint8_t *p_src,int p_length); ///< store an array of bytes
+
+ virtual bool file_exists(const String& p_name); ///< return true if a file exists
+
+ virtual uint64_t _get_modified_time(const String& p_file);
+
+ FileAccessEncrypted();
+ ~FileAccessEncrypted();
+};
+
+#endif // FILE_ACCESS_ENCRYPTED_H
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp
index df951c759a..c6c15af5e0 100644
--- a/core/io/marshalls.cpp
+++ b/core/io/marshalls.cpp
@@ -141,6 +141,23 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
(*r_len)+=4*3;
} break;
+ case Variant::MATRIX32: {
+
+ ERR_FAIL_COND_V(len<(int)4*6,ERR_INVALID_DATA);
+ Matrix32 val;
+ for(int i=0;i<3;i++) {
+ for(int j=0;j<2;j++) {
+
+ val.elements[i][j]=decode_float(&buf[(i*2+j)*4]);
+ }
+ }
+
+ r_variant=val;
+
+ if (r_len)
+ (*r_len)+=4*6;
+
+ } break;
case Variant::PLANE: {
ERR_FAIL_COND_V(len<(int)4*4,ERR_INVALID_DATA);
@@ -649,6 +666,45 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
} break;
+ case Variant::VECTOR2_ARRAY: {
+
+ ERR_FAIL_COND_V(len<4,ERR_INVALID_DATA);
+ uint32_t count = decode_uint32(buf);
+ ERR_FAIL_COND_V(count<0,ERR_INVALID_DATA);
+ buf+=4;
+ len-=4;
+
+ ERR_FAIL_COND_V((int)count*4*2>len,ERR_INVALID_DATA);
+ DVector<Vector2> varray;
+
+ if (r_len) {
+ (*r_len)+=4;
+ }
+
+ if (count) {
+ varray.resize(count);
+ DVector<Vector2>::Write w = varray.write();
+ const float *r = (const float*)buf;
+
+ for(int i=0;i<(int)count;i++) {
+
+ w[i].x=decode_float(buf+i*4*2+4*0);
+ w[i].y=decode_float(buf+i*4*2+4*1);
+
+ }
+
+ int adv = 4*2*count;
+
+ if (r_len)
+ (*r_len)+=adv;
+ len-=adv;
+ buf+=adv;
+
+ }
+
+ r_variant=varray;
+
+ } break;
case Variant::VECTOR3_ARRAY: {
ERR_FAIL_COND_V(len<4,ERR_INVALID_DATA);
@@ -888,6 +944,22 @@ Error encode_variant(const Variant& p_variant, uint8_t *r_buffer, int &r_len) {
r_len+=3*4;
} break;
+ case Variant::MATRIX32: {
+
+ if (buf) {
+ Matrix32 val=p_variant;
+ for(int i=0;i<3;i++) {
+ for(int j=0;j<2;j++) {
+
+ copymem(&buf[(i*2+j)*4],&val.elements[i][j],sizeof(float));
+ }
+ }
+ }
+
+
+ r_len+=6*4;
+
+ } break;
case Variant::PLANE: {
if (buf) {
@@ -1250,6 +1322,34 @@ Error encode_variant(const Variant& p_variant, uint8_t *r_buffer, int &r_len) {
}
} break;
+ case Variant::VECTOR2_ARRAY: {
+
+ DVector<Vector2> data = p_variant;
+ int len=data.size();
+
+ if (buf) {
+ encode_uint32(len,buf);
+ buf+=4;
+ }
+
+ r_len+=4;
+
+ if (buf) {
+
+ for(int i=0;i<len;i++) {
+
+ Vector2 v = data.get(i);
+
+ encode_float(v.x,&buf[0]);
+ encode_float(v.y,&buf[4]);
+ buf+=4*2;
+
+ }
+ }
+
+ r_len+=4*2*len;
+
+ } break;
case Variant::VECTOR3_ARRAY: {
DVector<Vector3> data = p_variant;
diff --git a/core/math/math_2d.h b/core/math/math_2d.h
index 1f45036409..2c8749f79d 100644
--- a/core/math/math_2d.h
+++ b/core/math/math_2d.h
@@ -272,7 +272,7 @@ struct Rect2 {
return new_rect;
};
- bool has_point(const Point2& p_point) const {
+ inline bool has_point(const Point2& p_point) const {
if (p_point.x < pos.x)
return false;
if (p_point.y < pos.y)
@@ -286,12 +286,12 @@ struct Rect2 {
return true;
}
- bool no_area() const { return (size.width<=0 || size.height<=0 ); }
+ inline bool no_area() const { return (size.width<=0 || size.height<=0 ); }
bool operator==(const Rect2& p_rect) const { return pos==p_rect.pos && size==p_rect.size; }
bool operator!=(const Rect2& p_rect) const { return pos!=p_rect.pos || size!=p_rect.size; }
- Rect2 grow(real_t p_by) const {
+ inline Rect2 grow(real_t p_by) const {
Rect2 g=*this;
g.pos.x-=p_by;
@@ -463,7 +463,7 @@ struct Rect2i {
return new_rect;
};
- bool has_point(const Point2& p_point) {
+ bool has_point(const Point2& p_point) const {
if (p_point.x < pos.x)
return false;
if (p_point.y < pos.y)
diff --git a/core/object_type_db.cpp b/core/object_type_db.cpp
index 289706334a..18878007a6 100644
--- a/core/object_type_db.cpp
+++ b/core/object_type_db.cpp
@@ -408,7 +408,7 @@ void ObjectTypeDB::add_signal(StringName p_type,const MethodInfo& p_signal) {
while(check) {
if (check->signal_map.has(sname)) {
- ERR_EXPLAIN("Type already has signal");
+ ERR_EXPLAIN("Type "+String(p_type)+" already has signal: "+String(sname));
ERR_FAIL();
}
check=check->inherits_ptr;
diff --git a/core/variant.cpp b/core/variant.cpp
index e02c9c33a1..6b3b25a103 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -298,6 +298,19 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) {
valid_types=valid;
} break;
+
+ case COLOR: {
+
+ static const Type valid[] = {
+ STRING,
+ INT,
+ NIL,
+ };
+
+ valid_types = valid;
+
+ } break;
+
case _RID: {
static const Type valid[]={
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 6ab33b7bcc..63d0fcec3a 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -977,7 +977,7 @@ Variant Variant::construct(const Variant::Type p_type,const Variant** p_args,int
case TRANSFORM: return (Transform(p_args[0]->operator Transform()));
// misc types
- case COLOR: return (Color(*p_args[0]));
+ case COLOR: return p_args[0]->type == Variant::STRING ? Color::html(*p_args[0]) : Color::hex(*p_args[0]);
case IMAGE: return (Image(*p_args[0]));
case NODE_PATH: return (NodePath(p_args[0]->operator NodePath())); // 15
case _RID: return (RID(*p_args[0]));
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 17:08:30 +0000