ipsec-332.tar.gz

[apple/ipsec.git] / ipsec-tools / racoon / vendorid.h

diff --git a/ipsec-tools/racoon/vendorid.h b/ipsec-tools/racoon/vendorid.h
index d3ecf67f283f01cf12ccbb25d806149516eea96d..464584d483452862e680dc807fc78684ca453ff8 100644 (file)
--- a/ipsec-tools/racoon/vendorid.h
+++ b/ipsec-tools/racoon/vendorid.h
@@ -61,7 +61,6 @@
 #define VENDORID_NATT_07       12
 #define VENDORID_NATT_08       13
 
 #define VENDORID_NATT_07       12
 #define VENDORID_NATT_08       13
 

-#ifdef __APPLE__

 #define VENDORID_NATT_APPLE 14
 #define VENDORID_NATT_RFC      15
 /* Hybrid auth */
 #define VENDORID_NATT_APPLE 14
 #define VENDORID_NATT_RFC      15
 /* Hybrid auth */


@@ -71,16 +70,6 @@
 #define VENDORID_FRAG          18
 /* Dead Peer Detection */
 #define VENDORID_DPD           19
 #define VENDORID_FRAG          18
 /* Dead Peer Detection */
 #define VENDORID_DPD           19

-#else /* __APPLE__ */
-#define VENDORID_NATT_RFC      14
-/* Hybrid auth */
-#define VENDORID_XAUTH         15
-#define VENDORID_UNITY         16
-/* IKE fragmentation */
-#define VENDORID_FRAG          17
-/* Dead Peer Detection */
-#define VENDORID_DPD           18
-#endif /* __APPLE__ */

 
 #define VENDORID_NATT_FIRST    VENDORID_NATT_00
 #define VENDORID_NATT_LAST     VENDORID_NATT_RFC
 
 #define VENDORID_NATT_FIRST    VENDORID_NATT_00
 #define VENDORID_NATT_LAST     VENDORID_NATT_RFC


@@ -95,10 +84,10 @@ struct vendor_id {
        vchar_t         *hash;
 };
 
        vchar_t         *hash;
 };
 

-vchar_t *set_vendorid __P((int));
-int check_vendorid __P((struct isakmp_gen *));
+vchar_t *set_vendorid (int);
+int check_vendorid (struct isakmp_gen *);

 
 

-void compute_vendorids __P((void));
-const char *vid_string_by_id __P((int id));
+void compute_vendorids (void);
+const char *vid_string_by_id (int id);

 
 #endif /* _VENDORID_H */
 
 #endif /* _VENDORID_H */