Revert "Work around a GCC bug that causes inet_checksum() to give wrong results."

[tinc] / src / rsa.h

diff --git a/src/rsa.h b/src/rsa.h
index f4290d4..a31ec24 100644 (file)
--- a/src/rsa.h
+++ b/src/rsa.h
@@ -1,3 +1,6 @@
+#ifndef TINC_RSA_H
+#define TINC_RSA_H
+
 /*
     rsa.h -- RSA key handling
     Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,20 +20,17 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_RSA_H__
-#define __TINC_RSA_H__
-
-#ifndef __TINC_RSA_INTERNAL__
+#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 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__));
+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