Don't assume sa.sa_family is a short int.

[tinc] / src / rsa.h

diff --git a/src/rsa.h b/src/rsa.h
index bcb795e..f4290d4 100644 (file)
--- a/src/rsa.h
+++ b/src/rsa.h
@@ -1,6 +1,6 @@
 /*
     rsa.h -- RSA key handling
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -12,29 +12,25 @@
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    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 __TINC_RSA_H__
 #define __TINC_RSA_H__
 
-#include <gcrypt.h>
-
-typedef struct rsa_key_t {
-       gcry_mpi_t n;
-       gcry_mpi_t e;
-       gcry_mpi_t d;
-} rsa_key_t;
-
-extern bool read_pem_rsa_public_key(FILE *fp, struct rsa_key_t *key);
-extern bool read_pem_rsa_private_key(FILE *fp, struct rsa_key_t *key);
-extern unsigned int get_rsa_size(struct rsa_key_t *key);
-extern bool rsa_public_encrypt(size_t len, void *in, void *out, struct rsa_key_t *key);
-extern bool rsa_private_decrypt(size_t len, void *in, void *out, struct rsa_key_t *key);
+#ifndef __TINC_RSA_INTERNAL__
+typedef struct rsa rsa_t;
+#endif
 
+extern void rsa_free(rsa_t *rsa);
+extern rsa_t *rsa_set_hex_public_key(char *n, char *e) __attribute__ ((__malloc__));
+extern rsa_t *rsa_set_hex_private_key(char *n, char *e, char *d) __attribute__ ((__malloc__));
+extern rsa_t *rsa_read_pem_public_key(FILE *fp) __attribute__ ((__malloc__));
+extern rsa_t *rsa_read_pem_private_key(FILE *fp) __attribute__ ((__malloc__));
+extern size_t rsa_size(rsa_t *rsa);
+extern bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) __attribute__ ((__warn_unused_result__));
+extern bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) __attribute__ ((__warn_unused_result__));
 
 #endif