From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 10 Dec 2006 16:08:40 +0000 (+0000)
Subject: 	Added old public key backwards support back.
X-Git-Tag: 1.2.beta1~562
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=484333112a32835340743aab4e07f511f14f31ef;p=crypto.git

	Added old public key backwards support back.
---

diff --git a/lib/silccrypt/silcpk.c b/lib/silccrypt/silcpk.c
index d9b81cba..b0fd7283 100644
--- a/lib/silccrypt/silcpk.c
+++ b/lib/silccrypt/silcpk.c
@@ -370,6 +370,10 @@ SilcBool silc_pkcs_silc_import_public_key(unsigned char *key,
   if (ret == -1)
     goto err;
 
+  /* Backwards compatibility */
+  if (totlen == key_len)
+    totlen -= 4;
+
   if (totlen + 4 != key_len)
     goto err;
 
@@ -816,7 +820,7 @@ SilcBool silc_pkcs_silc_import_private_key_file(unsigned char *filedata,
   /* Check file magic */
   SILC_GET32_MSB(magic, filedata);
   if (magic != SILC_PKCS_PRIVATE_KEY_MAGIC) {
-    SILC_LOG_ERROR(("Private key does not have correct magic"));
+    SILC_LOG_DEBUG(("Private key does not have correct magic"));
     return FALSE;
   }