From de54c0038bb2af97f7da3abd1e268a17b73a030b Mon Sep 17 00:00:00 2001 From: V V Date: Mon, 5 Oct 2015 17:41:14 +0300 Subject: [PATCH] updated tgl --- Makefile.tgl | 2 +- main.c | 4 ++-- tgl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.tgl b/Makefile.tgl index 3294e8a..8b30d2a 100644 --- a/Makefile.tgl +++ b/Makefile.tgl @@ -1,4 +1,4 @@ -TGL_OBJECTS=${OBJ}/mtproto-common.o ${OBJ}/mtproto-client.o ${OBJ}/queries.o ${OBJ}/structures.o ${OBJ}/binlog.o ${OBJ}/tgl.o ${OBJ}/updates.o ${OBJ}/tgl-net.o ${OBJ}/tgl-timers.o ${OBJ}/tg-mime-types.o ${OBJ}/mtproto-utils.o ${OBJ}/crypto/bn_openssl.o ${OBJ}/crypto/bn_altern.o ${OBJ}/crypto/rsa_pem_openssl.o ${OBJ}/crypto/rsa_pem_altern.o ${OBJ}/crypto/md5_openssl.o ${OBJ}/crypto/md5_altern.o ${OBJ}/crypto/sha_openssl.o ${OBJ}/crypto/sha_altern.o ${OBJ}/crypto/aes_openssl.o ${OBJ}/crypto/aes_altern.o +TGL_OBJECTS=${OBJ}/mtproto-common.o ${OBJ}/mtproto-client.o ${OBJ}/mtproto-key.o ${OBJ}/queries.o ${OBJ}/structures.o ${OBJ}/binlog.o ${OBJ}/tgl.o ${OBJ}/updates.o ${OBJ}/tgl-net.o ${OBJ}/tgl-timers.o ${OBJ}/tg-mime-types.o ${OBJ}/mtproto-utils.o ${OBJ}/crypto/bn_openssl.o ${OBJ}/crypto/bn_altern.o ${OBJ}/crypto/rsa_pem_openssl.o ${OBJ}/crypto/rsa_pem_altern.o ${OBJ}/crypto/md5_openssl.o ${OBJ}/crypto/md5_altern.o ${OBJ}/crypto/sha_openssl.o ${OBJ}/crypto/sha_altern.o ${OBJ}/crypto/aes_openssl.o ${OBJ}/crypto/aes_altern.o TGL_OBJECTS_AUTO=${OBJ}/auto/auto-skip.o ${OBJ}/auto/auto-fetch.o ${OBJ}/auto/auto-store.o ${OBJ}/auto/auto-autocomplete.o ${OBJ}/auto/auto-types.o ${OBJ}/auto/auto-fetch-ds.o ${OBJ}/auto/auto-free-ds.o ${OBJ}/auto/auto-store-ds.o ${OBJ}/auto/auto-print-ds.o diff --git a/main.c b/main.c index 34d0f16..cd2d792 100644 --- a/main.c +++ b/main.c @@ -62,6 +62,7 @@ #include "interface.h" #include #include +#include #ifdef USE_LUA # include "lua-tg.h" @@ -973,8 +974,7 @@ int main (int argc, char **argv) { #endif tgl_set_rsa_key (TLS, "tg-server.pub"); - #include "tgl/mtproto-key.c" - tgl_set_rsa_key_direct (TLS, _mtproto_default_e, _mtproto_default_key_len, _mtproto_default_key); + tgl_set_rsa_key_direct (TLS, tglmp_get_default_e (), tglmp_get_default_key_len (), tglmp_get_default_key ()); get_terminal_attributes (); diff --git a/tgl b/tgl index e092552..1789d77 160000 --- a/tgl +++ b/tgl @@ -1 +1 @@ -Subproject commit e092552313bcb97755c550552baa62b531b95203 +Subproject commit 1789d7780d5a65ef53348845cd51db595d39835a