Fix perf_crypto_rsa.c after various changes

Not perfect, but some functionality is nolonger exposed.

1 files changed, 20 insertions, 21 deletions

diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c
index 2be766b4a..f64b8335d 100644
--- a/src/util/perf_crypto_rsa.c
+++ b/src/util/perf_crypto_rsa.c
@@ -41,7 +41,7 @@ eval (unsigned int len)
   struct GNUNET_CRYPTO_RsaSignature *rsig;
   struct GNUNET_CRYPTO_RsaPublicKey *public_key;
   struct GNUNET_CRYPTO_RsaPrivateKey *private_key;
-  struct GNUNET_CRYPTO_RsaBlindingKey *bkey;
+  struct GNUNET_CRYPTO_RsaBlindingKeySecret bsec[10];
   unsigned int i;
   char sbuf[128];
   char *bbuf;
@@ -68,12 +68,13 @@ eval (unsigned int len)
                        (start).rel_value_us / 1000LL), "keys/ms");
   private_key = GNUNET_CRYPTO_rsa_private_key_create (len);
   public_key = GNUNET_CRYPTO_rsa_private_key_get_public (private_key);
+  for (i=0;i<10;i++)
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &bsec[i], sizeof (bsec[0]));
+  /*
   start = GNUNET_TIME_absolute_get ();
   for (i=0;i<10;i++)
-  {
-    bkey = GNUNET_CRYPTO_rsa_blinding_key_create (len);
-    GNUNET_CRYPTO_rsa_blinding_key_free (bkey);
-  }
+    rsa_blinding_key_derive(public_key, &bsec[i]);
   printf ("10x %u-blinding key generation took %s\n",
           len,
           GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start),
@@ -86,15 +87,15 @@ eval (unsigned int len)
           64 * 1024 / (1 +
                        GNUNET_TIME_absolute_get_duration
                        (start).rel_value_us / 1000LL), "keys/ms");
-  bkey = GNUNET_CRYPTO_rsa_blinding_key_create (len);
+  */
   start = GNUNET_TIME_absolute_get ();
   GNUNET_CRYPTO_hash ("test", 4, &hc);
   for (i=0;i<10;i++)
   {
-    bbuf_len = GNUNET_CRYPTO_rsa_blind (&hc,
-                                        bkey,
-                                        public_key,
-                                        &bbuf);
+    GNUNET_CRYPTO_rsa_blind (&hc,
+                             &bsec[i],
+                             public_key,
+                             &bbuf, &bbuf_len);
     GNUNET_free (bbuf);
   }
   printf ("10x %u-blinding took %s\n",
@@ -110,16 +111,15 @@ eval (unsigned int len)
           64 * 1024 / (1 +
                        GNUNET_TIME_absolute_get_duration
                        (start).rel_value_us / 1000LL), "ops/ms");
-  bbuf_len = GNUNET_CRYPTO_rsa_blind (&hc,
-                                      bkey,
-                                      public_key,
-                                      &bbuf);
+  GNUNET_CRYPTO_rsa_blind (&hc,
+                           &bsec[0],
+                           public_key,
+                           &bbuf, &bbuf_len);
   start = GNUNET_TIME_absolute_get ();
   for (i=0;i<10;i++)
   {
     sig = GNUNET_CRYPTO_rsa_sign_blinded (private_key,
-                                          bbuf,
-                                          bbuf_len);
+                                          bbuf, bbuf_len);
     GNUNET_CRYPTO_rsa_signature_free (sig);
   }
   printf ("10x %u-signing took %s\n",
@@ -142,7 +142,7 @@ eval (unsigned int len)
   for (i=0;i<10;i++)
   {
     rsig = GNUNET_CRYPTO_rsa_unblind (sig,
-                                      bkey,
+                                      &bsec[0],
                                       public_key);
     GNUNET_CRYPTO_rsa_signature_free (rsig);
   }
@@ -160,7 +160,7 @@ eval (unsigned int len)
                        GNUNET_TIME_absolute_get_duration
                        (start).rel_value_us / 1000LL), "ops/ms");
   rsig = GNUNET_CRYPTO_rsa_unblind (sig,
-                                    bkey,
+                                    &bsec[0],
                                     public_key);
   start = GNUNET_TIME_absolute_get ();
   for (i=0;i<10;i++)
@@ -186,7 +186,6 @@ eval (unsigned int len)
   GNUNET_CRYPTO_rsa_signature_free (sig);
   GNUNET_CRYPTO_rsa_public_key_free (public_key);
   GNUNET_CRYPTO_rsa_private_key_free (private_key);
-  GNUNET_CRYPTO_rsa_blinding_key_free (bkey);
   GNUNET_free (bbuf);
 }
 
@@ -194,8 +193,8 @@ eval (unsigned int len)
 int
 main (int argc, char *argv[])
 {
-  eval (1024);
-  eval (2048);
+  eval (1024); 
+  /* eval (2048); */
   /* eval (4096); */
   return 0;
 }