Support for public key encoding functions added.
authorPekka Riikonen <priikone@silcnet.org>
Mon, 10 Jul 2000 05:42:14 +0000 (05:42 +0000)
committerPekka Riikonen <priikone@silcnet.org>
Mon, 10 Jul 2000 05:42:14 +0000 (05:42 +0000)
apps/silcd/protocol.c

index fb5ac5b6ca68d6e9f1119cd59b0f469fb31c703d..d6daeba98b1ea3e14ae3fb35d43fe97c35f90689 100644 (file)
@@ -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)) {