[SCM] GNU shishi branch, master, updated. shishi-1-0-2-13-g817f540

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=817f540724c745e1441ce5931ff6066af7364e8c

The branch, master has been updated
       via  817f540724c745e1441ce5931ff6066af7364e8c (commit)
       via  e88cbeba9e81c2a824586d531bbd16551dc19898 (commit)
      from  e644366cab652b703fd2afd5a7b0883b69711b84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 817f540724c745e1441ce5931ff6066af7364e8c
Author: Mats Erik Andersson <address@hidden>
Date:   Wed May 8 19:50:09 2013 +0200

    Protect against null dereferencing.

commit e88cbeba9e81c2a824586d531bbd16551dc19898
Author: Mats Erik Andersson <address@hidden>
Date:   Wed May 8 19:44:48 2013 +0200

    Verbose timestamp info.
    
    Better format string when verbosely
    reporting on timestamps in a keytab.

-----------------------------------------------------------------------

Summary of changes:
 lib/crypto-ctx.c |    9 ++++++---
 lib/keytab.c     |    3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/crypto-ctx.c b/lib/crypto-ctx.c
index 9ca24c6..448b1bf 100644
--- a/lib/crypto-ctx.c
+++ b/lib/crypto-ctx.c
@@ -171,7 +171,10 @@ shishi_crypto_decrypt (Shishi_crypto * ctx,
 void
 shishi_crypto_close (Shishi_crypto * ctx)
 {
-  shishi_key_done (ctx->key);
-  free (ctx->iv);
-  free (ctx);
+  if (ctx)
+    {
+      shishi_key_done (ctx->key);
+      free (ctx->iv);
+      free (ctx);
+    }
 }
diff --git a/lib/keytab.c b/lib/keytab.c
index 1e7a833..6bd72dd 100644
--- a/lib/keytab.c
+++ b/lib/keytab.c
@@ -171,7 +171,8 @@ shishi_keys_add_keytab_mem (Shishi * handle,
        pos += 4;
 
        if (VERBOSENOISE (handle))
-         printf ("keytab timestamp %u (0x%08ux)\n", timestamp, timestamp);
+         printf ("keytab timestamp %s (0x%08x)\n",
+                 shishi_generalize_time (handle, timestamp), timestamp);
 
        shishi_key_timestamp_set (key, t);
       }


hooks/post-receive
-- 
GNU shishi