OR

2 files changed, 14 insertions, 2 deletions

diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index c3e0a7833..df4e24e7c 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -566,6 +566,8 @@ GNUNET_CRYPTO_rsa_key_create_from_file (const char *filename)
   unsigned int cnt;
   int ec;
   uint64_t fs;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
+  struct GNUNET_PeerIdentity pid;
 
   if (GNUNET_SYSERR == GNUNET_DISK_directory_create_for_file (filename))
     return NULL;
@@ -622,8 +624,12 @@ GNUNET_CRYPTO_rsa_key_create_from_file (const char *filename)
         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,
-                  _("Stored new private key in `%s'.\n"), filename);
+                  _("I am host `%s'.  Stored new private key in `%s'.\n"), 
+                  GNUNET_i2s (&pid),
+                  filename);
       return ret;
     }
   /* hostkey file exists already, read it! */
@@ -716,6 +722,12 @@ GNUNET_CRYPTO_rsa_key_create_from_file (const char *filename)
                                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);
   return ret;
 }
 
diff --git a/src/util/disk.c b/src/util/disk.c
index c1a988464..fa737843c 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1208,7 +1208,7 @@ GNUNET_DISK_file_open (const char *fn,
       return NULL;
     }
   if (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)
-    oflags |= (O_CREAT & O_EXCL);
+    oflags |= (O_CREAT | O_EXCL);
   if (flags & GNUNET_DISK_OPEN_TRUNCATE)
     oflags |= O_TRUNC;
   if (flags & GNUNET_DISK_OPEN_APPEND)