Accepting request 233928 from devel:libraries:c_c++

- add new 0007-User-interface-to-DRBG.patch from upstream
  * fixes bnc#877233
  * supersedes the patch from previous entry (forwarded request 233696 from vitezslav_cizek)

OBS-URL: https://build.opensuse.org/request/show/233928
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgcrypt?expand=0&rev=47
This commit is contained in:
Stephan Kulow 2014-05-17 20:01:36 +00:00 committed by Git OBS Bridge
commit 7ab67ad752
2 changed files with 14 additions and 6 deletions

View File

@ -1,11 +1,12 @@
Changes v4: Changes v4:
* add fail_seed_source to struct drbg_test_data * add explicit type casting from void to unsigned char as reported
in https://bugzilla.novell.com/show_bug.cgi?id=877233
Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Stephan Mueller <smueller at chronox.de>
--- ---
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index c84a3f7..2a17dcd 100644 index c84a3f7..569d7a0 100644
--- a/src/gcrypt.h.in --- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in +++ b/src/gcrypt.h.in
@@ -193,7 +193,7 @@ gcry_error_t gcry_err_make_from_errno (gcry_err_source_t source, int err); @@ -193,7 +193,7 @@ gcry_error_t gcry_err_make_from_errno (gcry_err_source_t source, int err);
@ -147,7 +148,7 @@ index c84a3f7..2a17dcd 100644
+/* DRBG input data structure for DRBG generate with additional information +/* DRBG input data structure for DRBG generate with additional information
+ * string */ + * string */
+struct drbg_gen { +struct drbg_gen {
+ void *outbuf; /* output buffer for random numbers */ + unsigned char *outbuf; /* output buffer for random numbers */
+ unsigned int outlen; /* size of output buffer */ + unsigned int outlen; /* size of output buffer */
+ struct drbg_string *addtl; /* input buffer for + struct drbg_string *addtl; /* input buffer for
+ * additional information string */ + * additional information string */
@ -185,7 +186,7 @@ index c84a3f7..2a17dcd 100644
+ struct drbg_string *addtl) + struct drbg_string *addtl)
+{ +{
+ struct drbg_gen genbuf; + struct drbg_gen genbuf;
+ genbuf.outbuf = outbuf; + genbuf.outbuf = (unsigned char *)outbuf;
+ genbuf.outlen = outlen; + genbuf.outlen = outlen;
+ genbuf.addtl = addtl; + genbuf.addtl = addtl;
+ genbuf.test_data = NULL; + genbuf.test_data = NULL;
@ -199,7 +200,7 @@ index c84a3f7..2a17dcd 100644
+ struct drbg_test_data *test_data) + struct drbg_test_data *test_data)
+{ +{
+ struct drbg_gen genbuf; + struct drbg_gen genbuf;
+ genbuf.outbuf = outbuf; + genbuf.outbuf = (unsigned char *)outbuf;
+ genbuf.outlen = outlen; + genbuf.outlen = outlen;
+ genbuf.addtl = addtl; + genbuf.addtl = addtl;
+ genbuf.test_data = test_data; + genbuf.test_data = test_data;

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 13 10:47:51 UTC 2014 - vcizek@suse.com
- add new 0007-User-interface-to-DRBG.patch from upstream
* fixes bnc#877233
* supersedes the patch from previous entry
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 12 13:25:33 UTC 2014 - tittiatcoke@gmail.com Sun May 12 13:25:33 UTC 2014 - tittiatcoke@gmail.com