separate out the rijndael libraries

diff --git a/all b/all
index 2592fde5e36e60cb491f69b7cb91e7eeb0d2429c..630d6a0e759fb2f1d26a4a1ac5f12c862b5fc790 100755 (executable)
--- a/all
+++ b/all
@@ -1287,7 +1287,14 @@ case "$cmd" in
                stamp=`cat Xonotic/stamp.txt`
                # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
                chmod a-x Xonotic/*.exe Xonotic/*.dll || true
-               # need to use infozip for these (+x bits)
+               # let's pass crypto import laws of some nasty countries
+               crypto_libs=`find Xonotic -name \*d0_rijndael\* -exec rm -f {} \;`
+               if [ -n "$crypto_libs" ]; then
+                       verbose mkzip Xonotic-$stamp-crypto.zip \
+                               $crypto_libs
+                       rm -f $crypto_libs
+               fi
+               # build the archives
                verbose mkzip Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \
                        Xonotic/bin64/*.dll \

diff --git a/misc/builddeps/dp.linux32/include/d0_blind_id/d0_rijndael.h b/misc/builddeps/dp.linux32/include/d0_blind_id/d0_rijndael.h
deleted file mode 100644 (file)
index e1c8f71..0000000
--- a/misc/builddeps/dp.linux32/include/d0_blind_id/d0_rijndael.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// from http://www.efgh.com/software/rijndael.htm (public domain)
-
-#ifndef H__RIJNDAEL
-#define H__RIJNDAEL
-
-#include "d0.h"
-
-D0_EXPORT int d0_rijndael_setup_encrypt(unsigned long *rk, const unsigned char *key,
-  int keybits);
-D0_EXPORT int d0_rijndael_setup_decrypt(unsigned long *rk, const unsigned char *key,
-  int keybits);
-D0_EXPORT void d0_rijndael_encrypt(const unsigned long *rk, int nrounds,
-  const unsigned char plaintext[16], unsigned char ciphertext[16]);
-D0_EXPORT void d0_rijndael_decrypt(const unsigned long *rk, int nrounds,
-  const unsigned char ciphertext[16], unsigned char plaintext[16]);
-
-#define D0_RIJNDAEL_KEYLENGTH(keybits) ((keybits)/8)
-#define D0_RIJNDAEL_RKLENGTH(keybits)  ((keybits)/8+28)
-#define D0_RIJNDAEL_NROUNDS(keybits)   ((keybits)/32+6)
-
-#endif

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.a b/misc/builddeps/dp.linux32/lib/libd0_rijndael.a
deleted file mode 100644 (file)
index eea4c90..0000000
Binary files a/misc/builddeps/dp.linux32/lib/libd0_rijndael.a and /dev/null differ

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.la b/misc/builddeps/dp.linux32/lib/libd0_rijndael.la
deleted file mode 100755 (executable)
index 8ac1881..0000000
--- a/misc/builddeps/dp.linux32/lib/libd0_rijndael.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libd0_rijndael.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libd0_rijndael.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/Darkplaces.build.linux32.deps/lib /tmp/gg/lib/libgmp.la'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libd0_rijndael.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/d0c/lib'

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so b/misc/builddeps/dp.linux32/lib/libd0_rijndael.so
deleted file mode 120000 (symlink)
index 01dce01..0000000
--- a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so
+++ /dev/null
@@ -1 +0,0 @@
-libd0_rijndael.so.0.0.0
\ No newline at end of file

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0 b/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0
deleted file mode 120000 (symlink)
index 01dce01..0000000
--- a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libd0_rijndael.so.0.0.0
\ No newline at end of file

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0.0.0 b/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0.0.0
deleted file mode 100755 (executable)
index 7c59e5c..0000000
Binary files a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0.0.0 and /dev/null differ

diff --git a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc
deleted file mode 100644 (file)
index 20d0d8f..0000000
--- a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/tmp/d0c
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Rijndael
-Description: Library for Rijndael encryption
-Requires: 
-Version: 0.1
-Libs: -L${libdir} -ld0_rijndael
-Cflags: -I${includedir}/d0_blind_id

diff --git a/misc/builddeps/dp.linux64/include/d0_blind_id/d0_rijndael.h b/misc/builddeps/dp.linux64/include/d0_blind_id/d0_rijndael.h
deleted file mode 100644 (file)
index e1c8f71..0000000
--- a/misc/builddeps/dp.linux64/include/d0_blind_id/d0_rijndael.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// from http://www.efgh.com/software/rijndael.htm (public domain)
-
-#ifndef H__RIJNDAEL
-#define H__RIJNDAEL
-
-#include "d0.h"
-
-D0_EXPORT int d0_rijndael_setup_encrypt(unsigned long *rk, const unsigned char *key,
-  int keybits);
-D0_EXPORT int d0_rijndael_setup_decrypt(unsigned long *rk, const unsigned char *key,
-  int keybits);
-D0_EXPORT void d0_rijndael_encrypt(const unsigned long *rk, int nrounds,
-  const unsigned char plaintext[16], unsigned char ciphertext[16]);
-D0_EXPORT void d0_rijndael_decrypt(const unsigned long *rk, int nrounds,
-  const unsigned char ciphertext[16], unsigned char plaintext[16]);
-
-#define D0_RIJNDAEL_KEYLENGTH(keybits) ((keybits)/8)
-#define D0_RIJNDAEL_RKLENGTH(keybits)  ((keybits)/8+28)
-#define D0_RIJNDAEL_NROUNDS(keybits)   ((keybits)/32+6)
-
-#endif

diff --git a/misc/builddeps/dp.linux64/lib/libd0_rijndael.a b/misc/builddeps/dp.linux64/lib/libd0_rijndael.a
deleted file mode 100644 (file)
index f1c8d73..0000000
Binary files a/misc/builddeps/dp.linux64/lib/libd0_rijndael.a and /dev/null differ

diff --git a/misc/builddeps/dp.linux64/lib/libd0_rijndael.la b/misc/builddeps/dp.linux64/lib/libd0_rijndael.la
deleted file mode 100755 (executable)
index 729015d..0000000
--- a/misc/builddeps/dp.linux64/lib/libd0_rijndael.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libd0_rijndael.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libd0_rijndael.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/Darkplaces.build.linux64.deps/lib /tmp/g/lib/libgmp.la'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libd0_rijndael.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/d0c/lib'

diff --git a/misc/builddeps/dp.linux64/lib/libd0_rijndael.so b/misc/builddeps/dp.linux64/lib/libd0_rijndael.so
deleted file mode 120000 (symlink)
index 01dce01..0000000
--- a/misc/builddeps/dp.linux64/lib/libd0_rijndael.so
+++ /dev/null
@@ -1 +0,0 @@
-libd0_rijndael.so.0.0.0
\ No newline at end of file

diff --git a/misc/builddeps/dp.linux64/lib/libd0_rijndael.so.0 b/misc/builddeps/dp.linux64/lib/libd0_rijndael.so.0
deleted file mode 120000 (symlink)
index 01dce01..0000000
--- a/misc/builddeps/dp.linux64/lib/libd0_rijndael.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libd0_rijndael.so.0.0.0
\ No newline at end of file

diff --git a/misc/builddeps/dp.linux64/lib/libd0_rijndael.so.0.0.0 b/misc/builddeps/dp.linux64/lib/libd0_rijndael.so.0.0.0
deleted file mode 100755 (executable)
index 62f1ab5..0000000
Binary files a/misc/builddeps/dp.linux64/lib/libd0_rijndael.so.0.0.0 and /dev/null differ

diff --git a/misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc b/misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc
deleted file mode 100644 (file)
index 20d0d8f..0000000
--- a/misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/tmp/d0c
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Rijndael
-Description: Library for Rijndael encryption
-Requires: 
-Version: 0.1
-Libs: -L${libdir} -ld0_rijndael
-Cflags: -I${includedir}/d0_blind_id

diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib
deleted file mode 100755 (executable)
index 1795fe7..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib and /dev/null differ

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael.0.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael.0.dylib
deleted file mode 100755 (executable)
index a9b6bfd..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael.0.dylib and /dev/null differ

diff --git a/misc/buildfiles/win32/libd0_rijndael-0.dll b/misc/buildfiles/win32/libd0_rijndael-0.dll
deleted file mode 100644 (file)
index 3296553..0000000
Binary files a/misc/buildfiles/win32/libd0_rijndael-0.dll and /dev/null differ

diff --git a/misc/buildfiles/win64/libd0_rijndael-0.dll b/misc/buildfiles/win64/libd0_rijndael-0.dll
deleted file mode 100644 (file)
index 87f7b87..0000000
Binary files a/misc/buildfiles/win64/libd0_rijndael-0.dll and /dev/null differ