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 ], @@ -351,7 +351,7 @@ AC_ARG_ENABLE(splash, build_splash=$enableval) AC_ARG_ENABLE(screensaver, -[ --enable-screensaver enable screensaver ], +[ --enable-screensaver enable screensaver ], 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 a6fbdc53..00000000 Binary files a/src/sysres/license/cryptool and /dev/null differ 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 ..