[GNUnet-SVN] r37206 - in gnunet/src: include my util

[gnunet]

Author: grothoff
Date: 2016-05-26 12:09:03 +0200 (Thu, 26 May 2016)
New Revision: 37206

Modified:
   gnunet/src/include/gnunet_my_lib.h
   gnunet/src/my/my.c
   gnunet/src/util/crypto_rsa.c
Log:
sketch envisioned API

Modified: gnunet/src/include/gnunet_my_lib.h
===================================================================
--- gnunet/src/include/gnunet_my_lib.h  2016-05-26 10:05:04 UTC (rev 37205)
+++ gnunet/src/include/gnunet_my_lib.h  2016-05-26 10:09:03 UTC (rev 37206)
@@ -304,7 +304,7 @@
  * FIXME.
  *
  */
- 
+
  /**
   * Variable-size result expected
   *
@@ -390,7 +390,7 @@
 GNUNET_MY_result_spec_uint64 (uint64_t *u64);
 
 int
-GNUNET_MY_extract_result (MYSQL_BIND * result,
+GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
                           struct GNUNET_MY_QueryParam *qp,
                           struct GNUNET_MY_ResultSpec *specs,
                           int row);

Modified: gnunet/src/my/my.c
===================================================================
--- gnunet/src/my/my.c  2016-05-26 10:05:04 UTC (rev 37205)
+++ gnunet/src/my/my.c  2016-05-26 10:09:03 UTC (rev 37206)
@@ -108,15 +108,20 @@
     #GNUNET_SYSERR if a result was invalid
 */
 int
-GNUNET_MY_extract_result (MYSQL_BIND * result,
+GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
                           struct GNUNET_MY_QueryParam *qp,
                           struct GNUNET_MY_ResultSpec *rs,
                           int row)
 {
+  MYSQL_BIND * result;
   unsigned int i;
   int had_null = GNUNET_NO;
   int ret;
+  MYSQL_STMT *stmt;
 
+  stmt = GNUNET_MYSQL_statement_get_stmt (NULL /* FIXME */, sh);
+  // result = mysql_get_result (stmt);
+  result = NULL;
   for (i = 0 ; NULL != rs[i].conv ; i++)
   {
     struct GNUNET_MY_ResultSpec *spec;

Modified: gnunet/src/util/crypto_rsa.c
===================================================================
--- gnunet/src/util/crypto_rsa.c        2016-05-26 10:05:04 UTC (rev 37205)
+++ gnunet/src/util/crypto_rsa.c        2016-05-26 10:09:03 UTC (rev 37206)
@@ -803,14 +803,20 @@
   struct GNUNET_CRYPTO_RsaPublicKey *public_key;
   gcry_sexp_t data;
   gcry_sexp_t result;
+  int rc;
 
   data = mpi_to_sexp (value);
 
   if (0 !=
-      gcry_pk_sign (&result,
-                    data,
-                    key->sexp))
+      (rc = gcry_pk_sign (&result,
+                          data,
+                          key->sexp)))
   {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         _("RSA signing failed at %s:%d: %s\n"),
+         __FILE__,
+         __LINE__,
+         gcry_strerror (rc));
     GNUNET_break (0);
     return NULL;
   }
@@ -863,7 +869,7 @@
 
   sig = rsa_sign_mpi (key, v);
   gcry_mpi_release (v);
-  return sig; 
+  return sig;
 }
 
 
@@ -890,7 +896,7 @@
 
   sig = rsa_sign_mpi (key, v);
   gcry_mpi_release (v);
-  return sig; 
+  return sig;
 
 }