Merge commit 'origin/silc.1.1.branch'

[silc.git] / lib / silcapputil / silcapputil.h

diff --git a/lib/silcapputil/silcapputil.h b/lib/silcapputil/silcapputil.h
index 4d3b8b01475da53a19ef2fe4796185838d3a2014..f4858d2ad6c31ef8d70a101a560989b28714c5d3 100644 (file)
--- a/lib/silcapputil/silcapputil.h
+++ b/lib/silcapputil/silcapputil.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2002 - 2006 Pekka Riikonen
+  Copyright (C) 2002 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -58,7 +58,8 @@
  *    and `prv_filename' is the public key and private key filenames.
  *    The `pub_identifier' is the public key identifier (for example:
  *    "UN=foobar, HN=hostname"), or if NULL the routine generates it
- *    automatically.
+ *    automatically.  The `return_public_key' and `return_private_key' may
+ *    be NULL.
  *
  *    The `passphrase' is the passphrase that is used to encrypt the
  *    private key file.  It is recommended that you would protect your
@@ -288,10 +289,10 @@ unsigned char *silc_channel_name_check(const unsigned char *identifier,
  * SYNOPSIS
  *
  *    SilcBool
- *    silc_channel_name_check(const unsigned char *identifier,
- *                            SilcUInt32 identifier_len,
- *                            SilcStringEncoding identifier_encoding,
- *                            SilcUInt32 max_allowed_length);
+ *    silc_channel_name_veirfy(const unsigned char *identifier,
+ *                             SilcUInt32 identifier_len,
+ *                             SilcStringEncoding identifier_encoding,
+ *                             SilcUInt32 max_allowed_length);
  *
  * DESCRIPTION
  *