[GNUnet-SVN] r10647 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-03-18 12:48:21 +0100 (Thu, 18 Mar 2010)
New Revision: 10647

Modified:
   gnunet/src/util/crypto_rsa.c
Log:
fix

Modified: gnunet/src/util/crypto_rsa.c
===================================================================
--- gnunet/src/util/crypto_rsa.c        2010-03-18 11:43:23 UTC (rev 10646)
+++ gnunet/src/util/crypto_rsa.c        2010-03-18 11:48:21 UTC (rev 10647)
@@ -713,8 +713,14 @@
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   _
-                  ("File `%s' does not contain a valid private key.  You 
should delete it.\n"),
+                  ("File `%s' does not contain a valid private key.  Deleting 
it.\n"),
                   filename);
+      if (0 != UNLINK (filename))
+       {
+         GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                   "unlink",
+                                   filename);
+       }
     }
   GNUNET_free (enc);
   if (GNUNET_YES !=
@@ -722,12 +728,15 @@
                                sizeof (struct RsaPrivateKeyBinaryEncoded)))
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "fcntl", filename);
   GNUNET_assert (GNUNET_YES == GNUNET_DISK_file_close (fd));
-  GNUNET_CRYPTO_rsa_key_get_public (ret, &pub);
-  GNUNET_CRYPTO_hash (&pub, sizeof (pub), &pid.hashPubKey);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             _("I am host `%s'.  Read private key from `%s'.\n"), 
-             GNUNET_i2s (&pid),
-             filename);
+  if (ret != NULL)
+    {
+      GNUNET_CRYPTO_rsa_key_get_public (ret, &pub);
+      GNUNET_CRYPTO_hash (&pub, sizeof (pub), &pid.hashPubKey);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                 _("I am host `%s'.  Read private key from `%s'.\n"), 
+                 GNUNET_i2s (&pid),
+                 filename);
+    }
   return ret;
 }