new blind_id dlls

diff --git a/misc/builddeps/dp.linux32/bin/blind_id b/misc/builddeps/dp.linux32/bin/blind_id
index 4cb7e5887ffa4b76f1a7534a8dc9ad0b04c0ac32..0aadf54dd729916dae12b5de5bc3d9b8f0578c20 100755 (executable)
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 f6082d261f65b6a40606122f50c92b2d4f564a18..bde14876fd0fab8d2e789c4f564a1d17ab3a9c5b 100644 (file)
--- 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 4723e761f6d77e21696b1bc45919d5611678bdc2..393aa08e036e99110639cf03d2b60578fbc85332 100644 (file)
--- 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 9b9d4a83d24a7659020917d7ee60153591128b17..ab41a60a4af4084c424ac25e5f96b71fdb1d2ea6 100644 (file)
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 a847c12d19f16bacf80fe5c7c10ea9818ff5b907..b631320fc7a07a1815022643033a54e03ecb1d88 100755 (executable)
--- 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 93ce7dea2dab26178330d6deff9da867e1f4ae31..3b9ea961d097f2dbcb699ea04297fd5a4d24e662 100644 (file)
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 8ac188184d68e537365b98c438b8e0e14305fa50..49c9909fe2f690240ed885ddebd9986d74754485 100755 (executable)
--- 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 a86ad65f5ced8aa964b2e6b94afd74d5186a87bc..4e6ffb193356e25e4897aa00f3fb00a39f122564 100644 (file)
--- 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 cbef8c45061394d80d6cd13e0e7263e9cb2db615..e728b2112dcf0c7a36ecdd7e46732a7ed3da232f 100644 (file)
--- 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 2486a6ecd4f1918ef3fc2c7f02d3a3c055c790d2..4678d500d6599beace627a2dacb1a6073c31e69e 100755 (executable)
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 f6082d261f65b6a40606122f50c92b2d4f564a18..bde14876fd0fab8d2e789c4f564a1d17ab3a9c5b 100644 (file)
--- 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 4723e761f6d77e21696b1bc45919d5611678bdc2..393aa08e036e99110639cf03d2b60578fbc85332 100644 (file)
--- 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 517bdfb30b01ea83b2d03aa7400bc6b474b7bbfa..e0347d56101ff15ef435a0de862a38cd10aa2f79 100644 (file)
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 0d3b4866d92a7632ca383d4f95aae1d4c48ef618..34767d3b36c33bb2cf19c971b23bd9bdbdac3271 100755 (executable)
--- 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 c46e5753381cbd535c46b95b6aae9e3c935cc79f..de0950ffe775426c503c998ffa6e8ea90e2cd8ae 100644 (file)
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 729015db7c866b47484d50416ea974a708493b43..f0bab29d5d614c7e746affd3647d4de8bdef6656 100755 (executable)
--- 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 a86ad65f5ced8aa964b2e6b94afd74d5186a87bc..4e6ffb193356e25e4897aa00f3fb00a39f122564 100644 (file)
--- 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 cbef8c45061394d80d6cd13e0e7263e9cb2db615..e728b2112dcf0c7a36ecdd7e46732a7ed3da232f 100644 (file)
--- 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 (file)
new mode 100755 (executable)
index 315b8f1..5139b42
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 (file)
new mode 100755 (executable)
index ccbf90e..af2458f
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 4367bff4334f9150a983dbe106399fae1bab7dbe..0986c29b1e9d6ad7b9a128dc159234c4156a13ee 100755 (executable)
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 c7f9ba880eddd115ceb1573df8deab001f940dcc..79a783c6b31d9c480ddbbd9428b713f5d8db73c9 100755 (executable)
Binary files a/misc/buildfiles/win64/libd0_rijndael-0.dll and b/misc/buildfiles/win64/libd0_rijndael-0.dll differ