Use nettle for hashing when available rather than internal MD5/SHA1 routines

[onak.git] / armor.h

diff --git a/armor.h b/armor.h
index 63f919859222c9b9f0bbf5b5849b7553d982bcf9..663e11183b1e1f11d8cff4f2e02946fe963c6f96 100644 (file)
--- a/armor.h
+++ b/armor.h
@@ -1,9 +1,20 @@
 /*
  * armor.h - Routines to (de)armor OpenPGP packet streams.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004, 2011 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * 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 the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef __ARMOR_H__
@@ -20,7 +31,8 @@
  *     This function ASCII armors a list of OpenPGP packets and outputs it
  *     using putchar_func.
  */
-int armor_openpgp_stream(int (*putchar_func)(void *ctx, unsigned char c),
+int armor_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
+                                               void *c),
                                void *ctx,
                                struct openpgp_packet_list *packets);
 
@@ -34,7 +46,8 @@ int armor_openpgp_stream(int (*putchar_func)(void *ctx, unsigned char c),
  *     armored OpenPGP stream and outputs the data as a linked list of
  *     packets.
  */
-int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, unsigned char *c),
+int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
+                                       void *c),
                                void *ctx,
                                struct openpgp_packet_list **packets);