From 62a1473aadfa29372d638cc72bd0d1757caecbd0 Mon Sep 17 00:00:00 2001
From: VincentWei <vincent@minigui.org>
Date: Tue, 16 Jan 2018 18:03:07 +0800
Subject: [PATCH] remove key.c and cryptool

---
 configure.ac                           |  24 ++++++++++++------------
 src/misc/license.c                     |   4 +++-
 src/sysres/license/c_files/Makefile.am |   1 -
 src/sysres/license/c_files/key.c       |   4 ----
 src/sysres/license/cryptool            | Bin 9713 -> 0 bytes
 src/sysres/license/runme.sh            |  21 +++++++++++----------
 6 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 src/sysres/license/c_files/key.c
 delete mode 100755 src/sysres/license/cryptool

diff --git a/configure.ac b/configure.ac
index d8147bc9..468e8dca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,7 +276,7 @@ enable_video_custom="no"
 dnl settings for license management
 build_productid="no"
 build_splash="yes"
-build_screensaver="yes"
+build_screensaver="no"
 
 AC_ARG_ENABLE(debug,
 [  --enable-debug           build with debugging messages <default=no>],
@@ -351,7 +351,7 @@ AC_ARG_ENABLE(splash,
 build_splash=$enableval)
 
 AC_ARG_ENABLE(screensaver,
-[  --enable-screensaver     enable screensaver <default=yes>],
+[  --enable-screensaver     enable screensaver <default=no>],
 build_screensaver=$enableval)
 
 AC_ARG_ENABLE(flatlf,
@@ -1512,16 +1512,16 @@ case "$with_osname" in
     ;;
 esac
 
-AC_ARG_WITH(licensepicture,
-  [  --with-licensepicture=minigui/mdolphin/hybridos])
-case "$with_licensepicture" in
-    minigui|mdolphin|hybridos)
-        LICENSE_PICTURE=$with_licensepicture
-        ;;
-    *)
-        LICENSE_PICTURE=minigui
-        ;;
-esac
+dnl AC_ARG_WITH(licensepicture,
+dnl   [  --with-licensepicture=minigui/mdolphin/hybridos])
+dnl case "$with_licensepicture" in
+dnl     minigui|mdolphin|hybridos)
+dnl         LICENSE_PICTURE=$with_licensepicture
+dnl         ;;
+dnl     *)
+dnl         LICENSE_PICTURE=minigui
+dnl         ;;
+dnl esac
 
 AC_ARG_WITH(targetname,
   [  --with-targetname=unknown/customer/fmsoft/mstudio/stb810/vfanvil/vxi386/qvfb/fbcon/mx21/monaco/c33l05/bfin/vxppc/
diff --git a/src/misc/license.c b/src/misc/license.c
index 8967e0d0..69a8e830 100644
--- a/src/misc/license.c
+++ b/src/misc/license.c
@@ -394,7 +394,9 @@ char *LICENSE_ENCRYPTED_CONST_STRING(unsigned char *src, int len){
     defined(_MG_ENABLE_SCREENSAVER) || \
     defined(_MG_ENABLE_WATERMARK)
 
-#define ENCRYPTED
+/* disable cryptool */
+#undef ENCRYPTED
+
 #ifdef ENCRYPTED
 #   include "../sysres/license/c_files/key.c"
 #endif
diff --git a/src/sysres/license/c_files/Makefile.am b/src/sysres/license/c_files/Makefile.am
index 84b240ac..3438ccfb 100644
--- a/src/sysres/license/c_files/Makefile.am
+++ b/src/sysres/license/c_files/Makefile.am
@@ -4,5 +4,4 @@ EXTRA_DIST= \
 	02_feiman.dat.c \
 	03_progressbar.dat.c \
 	04_progressbar-bk.dat.c \
-	key.c \
 	_splash_inner_res.c
diff --git a/src/sysres/license/c_files/key.c b/src/sysres/license/c_files/key.c
deleted file mode 100644
index c862b65f..00000000
--- a/src/sysres/license/c_files/key.c
+++ /dev/null
@@ -1,4 +0,0 @@
-MG_LOCAL unsigned char splash_crypto_key[16] = {
-    0x48,0xc6,0x98,0x82,0x5c,0x77,0x35,0x58,0x6f,0xc7,0x00,0x8d,0x3a,0x5b,0xea,0xc9
-};
-
diff --git a/src/sysres/license/cryptool b/src/sysres/license/cryptool
deleted file mode 100755
index a6fbdc530104a9b81cc7983d824d685281acc55b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9713
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

diff --git a/src/sysres/license/runme.sh b/src/sysres/license/runme.sh
index 3e067cf6..36c7c011 100755
--- a/src/sysres/license/runme.sh
+++ b/src/sysres/license/runme.sh
@@ -17,11 +17,11 @@ fi
 
 #RC4KEY=`echo -n $RANDOM | md5sum | awk '{print $1}'`
 #RC4KEY=`awk 'BEGIN {srand();for (i=1;i<=16;i++) printf("%02x",int(256*rand()))}'`
-RC4KEY=`./genkey.sh | awk '{print $1}'`
-echo "KEY: $RC4KEY"
-echo
+#RC4KEY=`./genkey.sh | awk '{print $1}'`
+#echo "KEY: $RC4KEY"
+#echo
 
-TMPRC4KEY=`echo -n $RC4KEY | awk '{for(i=1;i<=32;i+=2) {print "0x"substr($1,i,2)}}'`
+#TMPRC4KEY=`echo -n $RC4KEY | awk '{for(i=1;i<=32;i+=2) {print "0x"substr($1,i,2)}}'`
 #echo $TMPRC4KEY
 
 #
@@ -37,7 +37,8 @@ for src in $LIST; do
     dst=$DAT_DIR/$dst
 
     echo "$src --> $dst"
-    $CRYPTOOL -e $src $dst $RC4KEY
+#    $CRYPTOOL -e $src $dst $RC4KEY
+    cp $src $dst
 done
 
 cd $OLDPWD
@@ -49,12 +50,12 @@ cd $OLDPWD
 mkdir $C_DIR > /dev/null 2>&1
 
 # key.c
-CRC4KEY=`echo -n $TMPRC4KEY | sed "s/ /,/g"`
+#CRC4KEY=`echo -n $TMPRC4KEY | sed "s/ /,/g"`
 #echo $CRC4KEY
-echo "MG_LOCAL unsigned char splash_crypto_key[16] = {" > $C_DIR/key.c
-echo "    "$CRC4KEY >> $C_DIR/key.c
-echo "};" >> $C_DIR/key.c
-echo "" >> $C_DIR/key.c
+#echo "MG_LOCAL unsigned char splash_crypto_key[16] = {" > $C_DIR/key.c
+#echo "    "$CRC4KEY >> $C_DIR/key.c
+#echo "};" >> $C_DIR/key.c
+#echo "" >> $C_DIR/key.c
 
 cd $DAT_DIR; find . -name \*.dat | sed "s/^\.\/*//g" | sort > ../res.lst; cd ..