From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 10 Jul 2000 05:42:14 +0000 (+0000)
Subject: 	Support for public key encoding functions added.
X-Git-Tag: SILC.0.1~465
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=01a17da1539ab81f368ed877a49030e6d3655163

	Support for public key encoding functions added.
---

diff --git a/apps/silcd/protocol.c b/apps/silcd/protocol.c
index fb5ac5b6..d6daeba9 100644
--- a/apps/silcd/protocol.c
+++ b/apps/silcd/protocol.c
@@ -23,6 +23,9 @@
 /*
  * $Id$
  * $Log$
+ * Revision 1.5  2000/07/10 05:42:14  priikone
+ * 	Support for public key encoding functions added.
+ *
  * Revision 1.4  2000/07/07 06:55:59  priikone
  * 	Added SILC style public key support and made server to use
  * 	it at all time.
@@ -421,8 +424,9 @@ int silc_server_public_key_authentication(SilcServer server,
     return FALSE;
 
   /* Load public key from file */
-  if (!silc_pkcs_load_public_key(pkfile, &pub_key))
-    return FALSE;
+  if (!silc_pkcs_load_public_key(pkfile, &pub_key, SILC_PKCS_FILE_PEM))
+    if (!silc_pkcs_load_public_key(pkfile, &pub_key, SILC_PKCS_FILE_BIN))
+      return FALSE;
 
   silc_pkcs_alloc(pub_key->name, &pkcs);
   if (!silc_pkcs_public_key_set(pkcs, pub_key)) {