X-Git-Url: https://git.saurik.com/apple/ipsec.git/blobdiff_plain/52b7d2ce06d68d0a9160d16f6e7c08c21c149d0d..fbdc49661690dca0364dc89150f49ac23b1ad9b0:/ipsec-tools/racoon/algorithm.h?ds=sidebyside

diff --git a/ipsec-tools/racoon/algorithm.h b/ipsec-tools/racoon/algorithm.h
index e4fc1fe..a81cf7f 100644
--- a/ipsec-tools/racoon/algorithm.h
+++ b/ipsec-tools/racoon/algorithm.h
@@ -32,113 +32,29 @@
 #ifndef _ALGORITHM_H
 #define _ALGORITHM_H
 
-#include <gnuc.h>
-
-/* algorithm class */
-enum {
-	algclass_ipsec_enc,
-	algclass_ipsec_auth,
-	algclass_ipsec_comp,
-	algclass_isakmp_enc,
-	algclass_isakmp_hash,
-	algclass_isakmp_dh,
-	algclass_isakmp_ameth,	/* authentication method. */
-#define MAXALGCLASS	7
-};
+#include "Algorithm_types.h"
 
-#define ALG_DEFAULT_KEYLEN	64
-
-#define ALGTYPE_NOTHING		0
-
-/* algorithm type */
-enum algtype {
-	algtype_nothing = 0,
-
-	/* enc */
-	algtype_des_iv64,
-	algtype_des,
-	algtype_3des,
-	algtype_rc5,
-	algtype_idea,
-	algtype_cast128,
-	algtype_blowfish,
-	algtype_3idea,
-	algtype_des_iv32,
-	algtype_rc4,
-	algtype_null_enc,
-	algtype_aes,
-	algtype_twofish,
-
-	/* ipsec auth */
-	algtype_hmac_md5,
-	algtype_hmac_sha1,
-	algtype_des_mac,
-	algtype_kpdk,
-	algtype_non_auth,
-	algtype_hmac_sha2_256,
-	algtype_hmac_sha2_384,
-	algtype_hmac_sha2_512,
-
-	/* ipcomp */
-	algtype_oui,
-	algtype_deflate,
-	algtype_lzs,
-
-	/* hash */
-	algtype_md5,
-	algtype_sha1,
-	algtype_tiger,
-	algtype_sha2_256,
-	algtype_sha2_384,
-	algtype_sha2_512,
-
-	/* dh_group */
-	algtype_modp768,
-	algtype_modp1024,
-	algtype_ec2n155,
-	algtype_ec2n185,
-	algtype_modp1536,
-	algtype_modp2048,
-	algtype_modp3072,
-	algtype_modp4096,
-	algtype_modp6144,
-	algtype_modp8192,
-
-	/* authentication method. */
-	algtype_psk,
-	algtype_dsssig,
-	algtype_rsasig,
-	algtype_rsaenc,
-	algtype_rsarev,
-	algtype_gssapikrb,
-#ifdef ENABLE_HYBRID
-	algtype_hybrid_rsa_s,
-	algtype_hybrid_dss_s,
-	algtype_hybrid_rsa_c,
-	algtype_hybrid_dss_c,
-#endif
-};
 
 struct hmac_algorithm {
 	char *name;
 	int type;
 	int doi;
-	caddr_t (*init) __P((vchar_t *));
-	void (*update) __P((caddr_t, vchar_t *));
-	vchar_t *(*final) __P((caddr_t));
-	int (*hashlen) __P((void));
-	vchar_t *(*one) __P((vchar_t *, vchar_t *));
+	caddr_t (*init) (vchar_t *);
+	void (*update) (caddr_t, vchar_t *);
+	vchar_t *(*final) (caddr_t);
+	int (*hashlen) (void);
+	vchar_t *(*one) (vchar_t *, vchar_t *);
 };
 
 struct hash_algorithm {
 	char *name;
 	int type;
 	int doi;
-	caddr_t (*init) __P((void));
-	void (*update) __P((caddr_t, vchar_t *));
-	vchar_t *(*final) __P((caddr_t));
-	int (*hashlen) __P((void));
-	vchar_t *(*one) __P((vchar_t *));
+	caddr_t (*init) (void);
+	void (*update) (caddr_t, vchar_t *);
+	vchar_t *(*final) (caddr_t);
+	int (*hashlen) (void);
+	vchar_t *(*one) (vchar_t *);
 };
 
 struct enc_algorithm {
@@ -146,10 +62,10 @@ struct enc_algorithm {
 	int type;
 	int doi;
 	int blocklen;
-	vchar_t *(*encrypt) __P((vchar_t *, vchar_t *, vchar_t *));
-	vchar_t *(*decrypt) __P((vchar_t *, vchar_t *, vchar_t *));
-	int (*weakkey) __P((vchar_t *));
-	int (*keylen) __P((int));
+	vchar_t *(*encrypt) (vchar_t *, vchar_t *, vchar_t *);
+	vchar_t *(*decrypt) (vchar_t *, vchar_t *, vchar_t *);
+	int (*weakkey) (vchar_t *);
+	int (*keylen) (int);
 };
 
 /* dh group */
@@ -167,43 +83,43 @@ struct misc_algorithm {
 	int doi;
 };
 
-extern int alg_oakley_hashdef_ok __P((int));
-extern int alg_oakley_hashdef_doi __P((int));
-extern int alg_oakley_hashdef_hashlen __P((int));
-extern vchar_t *alg_oakley_hashdef_one __P((int, vchar_t *));
+extern int alg_oakley_hashdef_ok (int);
+extern int alg_oakley_hashdef_doi (int);
+extern int alg_oakley_hashdef_hashlen (int);
+extern vchar_t *alg_oakley_hashdef_one (int, vchar_t *);
 
-extern int alg_oakley_hmacdef_doi __P((int));
-extern vchar_t *alg_oakley_hmacdef_one __P((int, vchar_t *, vchar_t *));
+extern int alg_oakley_hmacdef_doi (int);
+extern vchar_t *alg_oakley_hmacdef_one (int, vchar_t *, vchar_t *);
 
-extern int alg_oakley_encdef_ok __P((int));
-extern int alg_oakley_encdef_doi __P((int));
-extern int alg_oakley_encdef_keylen __P((int, int));
-extern int alg_oakley_encdef_blocklen __P((int));
-extern vchar_t *alg_oakley_encdef_decrypt __P((int, vchar_t *, vchar_t *, vchar_t *));
-extern vchar_t *alg_oakley_encdef_encrypt __P((int, vchar_t *, vchar_t *, vchar_t *));
+extern int alg_oakley_encdef_ok (int);
+extern int alg_oakley_encdef_doi (int);
+extern int alg_oakley_encdef_keylen (int, int);
+extern int alg_oakley_encdef_blocklen (int);
+extern vchar_t *alg_oakley_encdef_decrypt (int, vchar_t *, vchar_t *, vchar_t *);
+extern vchar_t *alg_oakley_encdef_encrypt (int, vchar_t *, vchar_t *, vchar_t *);
 
-extern int alg_ipsec_encdef_doi __P((int));
-extern int alg_ipsec_encdef_keylen __P((int, int));
+extern int alg_ipsec_encdef_doi (int);
+extern int alg_ipsec_encdef_keylen (int, int);
 
-extern int alg_ipsec_hmacdef_doi __P((int));
-extern int alg_ipsec_hmacdef_hashlen __P((int));
+extern int alg_ipsec_hmacdef_doi (int);
+extern int alg_ipsec_hmacdef_hashlen (int);
 
-extern int alg_ipsec_compdef_doi __P((int));
+extern int alg_ipsec_compdef_doi (int);
 
-extern int alg_oakley_dhdef_doi __P((int));
-extern int alg_oakley_dhdef_ok __P((int));
-extern struct dhgroup *alg_oakley_dhdef_group __P((int));
+extern int alg_oakley_dhdef_doi (int);
+extern int alg_oakley_dhdef_ok (int);
+extern struct dhgroup *alg_oakley_dhdef_group (int);
 
-extern int alg_oakley_authdef_doi __P((int));
+extern int alg_oakley_authdef_doi (int);
 
-extern int default_keylen __P((int, int));
-extern int check_keylen __P((int, int, int));
-extern int algtype2doi __P((int, int));
-extern int algclass2doi __P((int));
+extern int default_keylen (int, int);
+extern int check_keylen (int, int, int);
+extern int algtype2doi (int, int);
+extern int algclass2doi (int);
 
-extern const char *alg_oakley_encdef_name __P((int));
-extern const char *alg_oakley_hashdef_name __P((int));
-extern const char *alg_oakley_dhdef_name __P((int));
-extern const char *alg_oakley_authdef_name __P((int));
+extern const char *alg_oakley_encdef_name (int);
+extern const char *alg_oakley_hashdef_name (int);
+extern const char *alg_oakley_dhdef_name (int);
+extern const char *alg_oakley_authdef_name (int);
 
 #endif /* _ALGORITHM_H */