From: Xonotic Build Service Date: Thu, 27 Oct 2011 08:29:54 +0000 (+0200) Subject: new blind_id dlls X-Git-Tag: xonotic-v0.6.0~69^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7687bb2ce878c6514bf2950d5f971486dd146c7f;p=xonotic%2Fxonotic.git new blind_id dlls --- diff --git a/misc/builddeps/dp.linux32/bin/blind_id b/misc/builddeps/dp.linux32/bin/blind_id index 4cb7e588..0aadf54d 100755 Binary files a/misc/builddeps/dp.linux32/bin/blind_id and b/misc/builddeps/dp.linux32/bin/blind_id differ diff --git a/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h b/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h index f6082d26..bde14876 100644 --- a/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h +++ b/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Format:commit %H$ - * $Id: 9a7b912057b836675f4e24f08514cad53fa46d2a $ + * $Id: a6b551ba6968466f5bf1003bd1f000cd29beb698 $ */ #ifndef __D0_H__ @@ -42,8 +42,23 @@ #define D0_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define D0_BOOL int -extern void *(*d0_malloc)(size_t len); -extern void (*d0_free)(void *p); +typedef void *(d0_malloc_t)(size_t len); +typedef void (d0_free_t)(void *p); +typedef void *(d0_createmutex_t)(void); +typedef void (d0_destroymutex_t)(void *); +typedef int (d0_lockmutex_t)(void *); // zero on success +typedef int (d0_unlockmutex_t)(void *); // zero on success + +extern d0_malloc_t *d0_malloc; +extern d0_free_t *d0_free; +extern d0_createmutex_t *d0_createmutex; +extern d0_destroymutex_t *d0_destroymutex; +extern d0_lockmutex_t *d0_lockmutex; +extern d0_unlockmutex_t *d0_unlockmutex; + +void d0_setmallocfuncs(d0_malloc_t *m, d0_free_t *f); +void d0_setmutexfuncs(d0_createmutex_t *c, d0_destroymutex_t *d, d0_lockmutex_t *l, d0_unlockmutex_t *u); + extern const char *d0_bsd_license_notice; #endif diff --git a/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h b/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h index 4723e761..393aa08e 100644 --- a/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h +++ b/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Format:commit %H$ - * $Id: bea924581e2a7daf61a2fe20ab360ed1f05f5aaa $ + * $Id: cbb0b2c932cb3a3c921ef6969522ba6250d54ece $ */ #ifndef __D0_BLIND_ID_H__ @@ -82,4 +82,8 @@ D0_EXPORT void d0_blind_id_SHUTDOWN(void); D0_EXPORT void d0_blind_id_util_sha256(char *out, const char *in, size_t n); +// for exporting +D0_EXPORT void d0_blind_id_setmallocfuncs(d0_malloc_t *m, d0_free_t *f); +D0_EXPORT void d0_blind_id_setmutexfuncs(d0_createmutex_t *c, d0_destroymutex_t *d, d0_lockmutex_t *l, d0_unlockmutex_t *u); + #endif diff --git a/misc/builddeps/dp.linux32/lib/libd0_blind_id.a b/misc/builddeps/dp.linux32/lib/libd0_blind_id.a index 9b9d4a83..ab41a60a 100644 Binary files a/misc/builddeps/dp.linux32/lib/libd0_blind_id.a and b/misc/builddeps/dp.linux32/lib/libd0_blind_id.a differ diff --git a/misc/builddeps/dp.linux32/lib/libd0_blind_id.la b/misc/builddeps/dp.linux32/lib/libd0_blind_id.la index a847c12d..b631320f 100755 --- a/misc/builddeps/dp.linux32/lib/libd0_blind_id.la +++ b/misc/builddeps/dp.linux32/lib/libd0_blind_id.la @@ -17,7 +17,7 @@ old_library='libd0_blind_id.a' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L/tmp/Darkplaces.build.linux32.deps/lib /tmp/gg/lib/libgmp.la' +dependency_libs=' -L/tmp/d0_blind_id.deps/lib/ /tmp/gg/lib/libgmp.la' # Names of additional weak libraries provided by this library weak_library_names='' @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/tmp/d0c/lib' +libdir='/usr/local/lib' diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.a b/misc/builddeps/dp.linux32/lib/libd0_rijndael.a index 93ce7dea..3b9ea961 100644 Binary files a/misc/builddeps/dp.linux32/lib/libd0_rijndael.a and b/misc/builddeps/dp.linux32/lib/libd0_rijndael.a differ diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.la b/misc/builddeps/dp.linux32/lib/libd0_rijndael.la index 8ac18818..49c9909f 100755 --- a/misc/builddeps/dp.linux32/lib/libd0_rijndael.la +++ b/misc/builddeps/dp.linux32/lib/libd0_rijndael.la @@ -17,7 +17,7 @@ old_library='libd0_rijndael.a' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L/tmp/Darkplaces.build.linux32.deps/lib /tmp/gg/lib/libgmp.la' +dependency_libs=' -L/tmp/d0_blind_id.deps/lib/ /tmp/gg/lib/libgmp.la' # Names of additional weak libraries provided by this library weak_library_names='' @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/tmp/d0c/lib' +libdir='/usr/local/lib' diff --git a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc index a86ad65f..4e6ffb19 100644 --- a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc +++ b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc @@ -1,4 +1,4 @@ -prefix=/tmp/d0c +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: Blind-ID Description: Library for user identification using RSA blind signatures Requires: -Version: 0.3 +Version: 0.4 Libs: -L${libdir} -ld0_blind_id Cflags: -I${includedir}/d0_blind_id diff --git a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc index cbef8c45..e728b211 100644 --- a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc +++ b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc @@ -1,4 +1,4 @@ -prefix=/tmp/d0c +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: Rijndael Description: Library for Rijndael encryption Requires: -Version: 0.3 +Version: 0.4 Libs: -L${libdir} -ld0_rijndael Cflags: -I${includedir}/d0_blind_id diff --git a/misc/builddeps/dp.linux64/bin/blind_id b/misc/builddeps/dp.linux64/bin/blind_id index 2486a6ec..4678d500 100755 Binary files a/misc/builddeps/dp.linux64/bin/blind_id and b/misc/builddeps/dp.linux64/bin/blind_id differ diff --git a/misc/builddeps/dp.linux64/include/d0_blind_id/d0.h b/misc/builddeps/dp.linux64/include/d0_blind_id/d0.h index f6082d26..bde14876 100644 --- a/misc/builddeps/dp.linux64/include/d0_blind_id/d0.h +++ b/misc/builddeps/dp.linux64/include/d0_blind_id/d0.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Format:commit %H$ - * $Id: 9a7b912057b836675f4e24f08514cad53fa46d2a $ + * $Id: a6b551ba6968466f5bf1003bd1f000cd29beb698 $ */ #ifndef __D0_H__ @@ -42,8 +42,23 @@ #define D0_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define D0_BOOL int -extern void *(*d0_malloc)(size_t len); -extern void (*d0_free)(void *p); +typedef void *(d0_malloc_t)(size_t len); +typedef void (d0_free_t)(void *p); +typedef void *(d0_createmutex_t)(void); +typedef void (d0_destroymutex_t)(void *); +typedef int (d0_lockmutex_t)(void *); // zero on success +typedef int (d0_unlockmutex_t)(void *); // zero on success + +extern d0_malloc_t *d0_malloc; +extern d0_free_t *d0_free; +extern d0_createmutex_t *d0_createmutex; +extern d0_destroymutex_t *d0_destroymutex; +extern d0_lockmutex_t *d0_lockmutex; +extern d0_unlockmutex_t *d0_unlockmutex; + +void d0_setmallocfuncs(d0_malloc_t *m, d0_free_t *f); +void d0_setmutexfuncs(d0_createmutex_t *c, d0_destroymutex_t *d, d0_lockmutex_t *l, d0_unlockmutex_t *u); + extern const char *d0_bsd_license_notice; #endif diff --git a/misc/builddeps/dp.linux64/include/d0_blind_id/d0_blind_id.h b/misc/builddeps/dp.linux64/include/d0_blind_id/d0_blind_id.h index 4723e761..393aa08e 100644 --- a/misc/builddeps/dp.linux64/include/d0_blind_id/d0_blind_id.h +++ b/misc/builddeps/dp.linux64/include/d0_blind_id/d0_blind_id.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Format:commit %H$ - * $Id: bea924581e2a7daf61a2fe20ab360ed1f05f5aaa $ + * $Id: cbb0b2c932cb3a3c921ef6969522ba6250d54ece $ */ #ifndef __D0_BLIND_ID_H__ @@ -82,4 +82,8 @@ D0_EXPORT void d0_blind_id_SHUTDOWN(void); D0_EXPORT void d0_blind_id_util_sha256(char *out, const char *in, size_t n); +// for exporting +D0_EXPORT void d0_blind_id_setmallocfuncs(d0_malloc_t *m, d0_free_t *f); +D0_EXPORT void d0_blind_id_setmutexfuncs(d0_createmutex_t *c, d0_destroymutex_t *d, d0_lockmutex_t *l, d0_unlockmutex_t *u); + #endif diff --git a/misc/builddeps/dp.linux64/lib/libd0_blind_id.a b/misc/builddeps/dp.linux64/lib/libd0_blind_id.a index 517bdfb3..e0347d56 100644 Binary files a/misc/builddeps/dp.linux64/lib/libd0_blind_id.a and b/misc/builddeps/dp.linux64/lib/libd0_blind_id.a differ diff --git a/misc/builddeps/dp.linux64/lib/libd0_blind_id.la b/misc/builddeps/dp.linux64/lib/libd0_blind_id.la index 0d3b4866..34767d3b 100755 --- a/misc/builddeps/dp.linux64/lib/libd0_blind_id.la +++ b/misc/builddeps/dp.linux64/lib/libd0_blind_id.la @@ -17,7 +17,7 @@ old_library='libd0_blind_id.a' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L/tmp/Darkplaces.build.linux64.deps/lib /tmp/g/lib/libgmp.la' +dependency_libs=' -L/tmp/d0_blind_id.deps/lib/ /tmp/g/lib/libgmp.la' # Names of additional weak libraries provided by this library weak_library_names='' @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/tmp/d0c/lib' +libdir='/usr/local/lib' diff --git a/misc/builddeps/dp.linux64/lib/libd0_rijndael.a b/misc/builddeps/dp.linux64/lib/libd0_rijndael.a index c46e5753..de0950ff 100644 Binary files a/misc/builddeps/dp.linux64/lib/libd0_rijndael.a and b/misc/builddeps/dp.linux64/lib/libd0_rijndael.a differ diff --git a/misc/builddeps/dp.linux64/lib/libd0_rijndael.la b/misc/builddeps/dp.linux64/lib/libd0_rijndael.la index 729015db..f0bab29d 100755 --- a/misc/builddeps/dp.linux64/lib/libd0_rijndael.la +++ b/misc/builddeps/dp.linux64/lib/libd0_rijndael.la @@ -17,7 +17,7 @@ old_library='libd0_rijndael.a' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L/tmp/Darkplaces.build.linux64.deps/lib /tmp/g/lib/libgmp.la' +dependency_libs=' -L/tmp/d0_blind_id.deps/lib/ /tmp/g/lib/libgmp.la' # Names of additional weak libraries provided by this library weak_library_names='' @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/tmp/d0c/lib' +libdir='/usr/local/lib' diff --git a/misc/builddeps/dp.linux64/lib/pkgconfig/d0_blind_id.pc b/misc/builddeps/dp.linux64/lib/pkgconfig/d0_blind_id.pc index a86ad65f..4e6ffb19 100644 --- a/misc/builddeps/dp.linux64/lib/pkgconfig/d0_blind_id.pc +++ b/misc/builddeps/dp.linux64/lib/pkgconfig/d0_blind_id.pc @@ -1,4 +1,4 @@ -prefix=/tmp/d0c +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: Blind-ID Description: Library for user identification using RSA blind signatures Requires: -Version: 0.3 +Version: 0.4 Libs: -L${libdir} -ld0_blind_id Cflags: -I${includedir}/d0_blind_id diff --git a/misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc b/misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc index cbef8c45..e728b211 100644 --- a/misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc +++ b/misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc @@ -1,4 +1,4 @@ -prefix=/tmp/d0c +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: Rijndael Description: Library for Rijndael encryption Requires: -Version: 0.3 +Version: 0.4 Libs: -L${libdir} -ld0_rijndael Cflags: -I${includedir}/d0_blind_id diff --git a/misc/buildfiles/win32/libd0_blind_id-0.dll b/misc/buildfiles/win32/libd0_blind_id-0.dll old mode 100644 new mode 100755 index 315b8f1c..5139b42e Binary files a/misc/buildfiles/win32/libd0_blind_id-0.dll and b/misc/buildfiles/win32/libd0_blind_id-0.dll differ diff --git a/misc/buildfiles/win32/libd0_rijndael-0.dll b/misc/buildfiles/win32/libd0_rijndael-0.dll old mode 100644 new mode 100755 index ccbf90e5..af2458f3 Binary files a/misc/buildfiles/win32/libd0_rijndael-0.dll and b/misc/buildfiles/win32/libd0_rijndael-0.dll differ diff --git a/misc/buildfiles/win64/libd0_blind_id-0.dll b/misc/buildfiles/win64/libd0_blind_id-0.dll index 4367bff4..0986c29b 100755 Binary files a/misc/buildfiles/win64/libd0_blind_id-0.dll and b/misc/buildfiles/win64/libd0_blind_id-0.dll differ diff --git a/misc/buildfiles/win64/libd0_rijndael-0.dll b/misc/buildfiles/win64/libd0_rijndael-0.dll index c7f9ba88..79a783c6 100755 Binary files a/misc/buildfiles/win64/libd0_rijndael-0.dll and b/misc/buildfiles/win64/libd0_rijndael-0.dll differ