Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / pq / test_pq.c

diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index b9bf1be76cabadbd742fbd1630f88149083ade7b..b543181103758eb05b3d09f2df8633217bc6c6cf 100644 (file)
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -89,10 +89,10 @@ postgres_prepare (PGconn *db_conn)
 static int
 run_queries (PGconn *conn)
 {
-  struct GNUNET_CRYPTO_rsa_PublicKey *pub;
-  struct GNUNET_CRYPTO_rsa_PublicKey *pub2 = NULL;
-  struct GNUNET_CRYPTO_rsa_Signature *sig;
-  struct GNUNET_CRYPTO_rsa_Signature *sig2 = NULL;
+  struct GNUNET_CRYPTO_RsaPublicKey *pub;
+  struct GNUNET_CRYPTO_RsaPublicKey *pub2 = NULL;
+  struct GNUNET_CRYPTO_RsaSignature *sig;
+  struct GNUNET_CRYPTO_RsaSignature *sig2 = NULL;
   struct GNUNET_TIME_Absolute abs_time = GNUNET_TIME_absolute_get ();
   struct GNUNET_TIME_Absolute abs_time2;
   struct GNUNET_TIME_Absolute forever = GNUNET_TIME_UNIT_FOREVER_ABS;
@@ -101,9 +101,10 @@ run_queries (PGconn *conn)
   struct GNUNET_HashCode hc2;
   PGresult *result;
   int ret;
-  struct GNUNET_CRYPTO_rsa_PrivateKey *priv;
-  char msg[] = "Hello";
+  struct GNUNET_CRYPTO_RsaPrivateKey *priv;
+  const char msg[] = "hello";
   void *msg2;
+  struct GNUNET_HashCode hmsg;
   size_t msg2_len;
   uint16_t u16;
   uint16_t u162;
@@ -114,9 +115,9 @@ run_queries (PGconn *conn)
 
   priv = GNUNET_CRYPTO_rsa_private_key_create (1024);
   pub = GNUNET_CRYPTO_rsa_private_key_get_public (priv);
-  sig = GNUNET_CRYPTO_rsa_sign (priv,
-                               msg,
-                               sizeof (msg));
+  memset (&hmsg, 42, sizeof (hmsg));
+  sig = GNUNET_CRYPTO_rsa_sign_fdh (priv,
+                                    &hmsg);
   u16 = 16;
   u32 = 32;
   u64 = 64;
@@ -217,8 +218,8 @@ run_queries (PGconn *conn)
 
 
 int
-main(int argc,
-     const char *const argv[])
+main (int argc,
+      const char *const argv[])
 {
   PGconn *conn;
   PGresult *result;
@@ -235,7 +236,7 @@ main(int argc,
             PQerrorMessage (conn));
     GNUNET_break (0);
     PQfinish (conn);
-    return 0; /* We ignore this type of error... */
+    return 77; /* signal test was skipped */
   }
 
   result = PQexec (conn,