xnu-1699.32.7.tar.gz

[apple/xnu.git] / bsd / netkey / keydb.h

diff --git a/bsd/netkey/keydb.h b/bsd/netkey/keydb.h
index 4e2160a75976c3d4add2caadefc59d90290ad5cf..e304c336f2906ecac6a12f846144b1a848a95b98 100644 (file)
--- a/bsd/netkey/keydb.h
+++ b/bsd/netkey/keydb.h
@@ -31,8 +31,10 @@
 
 #ifndef _NETKEY_KEYDB_H_
 #define _NETKEY_KEYDB_H_
+#include <sys/appleapiopts.h>
 
 #ifdef KERNEL
+#ifdef KERNEL_PRIVATE
 
 #include <netkey/key_var.h>
 
@@ -57,6 +59,7 @@ struct secashead {
        struct sadb_ident *identd;      /* destination identity */
                                        /* XXX I don't know how to use them. */
 
+       u_int8_t dir;                   /* IPSEC_DIR_INBOUND or IPSEC_DIR_OUTBOUND */
        u_int8_t state;                 /* MATURE or DEAD. */
        LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1];
                                        /* SA chain */
@@ -68,7 +71,7 @@ struct secashead {
 /* Security Association */
 struct secasvar {
        LIST_ENTRY(secasvar) chain;
-
+       LIST_ENTRY(secasvar) spihash;
        int refcnt;                     /* reference count */
        u_int8_t state;                 /* Status of this Association */
 
@@ -78,19 +81,14 @@ struct secasvar {
        u_int32_t flags;                /* holder for SADB_KEY_FLAGS */
 
        struct sadb_key *key_auth;      /* Key for Authentication */
-                                       /* length has been shifted up to 3. */
        struct sadb_key *key_enc;       /* Key for Encryption */
-                                       /* length has been shifted up to 3. */
        caddr_t iv;                     /* Initilization Vector */
        u_int ivlen;                    /* length of IV */
-#if 0
-       caddr_t misc1;
-       caddr_t misc2;
-       caddr_t misc3;
-#endif
+       void *sched;                    /* intermediate encryption key */
+       size_t schedlen;
 
        struct secreplay *replay;       /* replay prevention */
-       u_int32_t tick;                 /* for lifetime */
+       long created;                   /* for lifetime */
 
        struct sadb_lifetime *lft_c;    /* CURRENT lifetime, it's constant. */
        struct sadb_lifetime *lft_h;    /* HARD lifetime */
@@ -100,6 +98,11 @@ struct secasvar {
        pid_t pid;                      /* message's pid */
 
        struct secashead *sah;          /* back pointer to the secashead */
+       
+       /* Nat Traversal related bits */
+       u_int32_t       natt_last_activity;
+       u_int16_t       remote_ike_port;
+       u_int16_t       natt_encapsulated_src_port;     /* network byte order */
 };
 
 /* replay prevention */
@@ -127,7 +130,7 @@ struct secacq {
        struct secasindex saidx;
 
        u_int32_t seq;          /* sequence number */
-       u_int32_t tick;         /* for lifetime */
+       long created;           /* for lifetime */
        int count;              /* for lifetime */
 };
 #endif
@@ -143,22 +146,23 @@ struct key_cb {
 };
 
 /* secpolicy */
-extern struct secpolicy *keydb_newsecpolicy __P((void));
-extern void keydb_delsecpolicy __P((struct secpolicy *));
+extern struct secpolicy *keydb_newsecpolicy(void);
+extern void keydb_delsecpolicy(struct secpolicy *);
 /* secashead */
-extern struct secashead *keydb_newsecashead __P((void));
-extern void keydb_delsecashead __P((struct secashead *));
+extern struct secashead *keydb_newsecashead(void);
+// extern void keydb_delsecashead(struct secashead *); // not used
 /* secasvar */
-extern struct secasvar *keydb_newsecasvar __P((void));
-extern void keydb_refsecasvar __P((struct secasvar *));
-extern void keydb_freesecasvar __P((struct secasvar *));
+// extern struct secasvar *keydb_newsecasvar(void);            // not used
+// extern void keydb_refsecasvar(struct secasvar *);   // not used
+// extern void keydb_freesecasvar(struct secasvar *);  // not used
 /* secreplay */
-extern struct secreplay *keydb_newsecreplay __P((size_t));
-extern void keydb_delsecreplay __P((struct secreplay *));
+extern struct secreplay *keydb_newsecreplay(size_t);
+extern void keydb_delsecreplay(struct secreplay *);
 /* secreg */
-extern struct secreg *keydb_newsecreg __P((void));
-extern void keydb_delsecreg __P((struct secreg *));
+// extern struct secreg *keydb_newsecreg(void);                        // not used
+// extern void keydb_delsecreg(struct secreg *);               // not used
 
+#endif /* KERNEL_PRIVATE */
 #endif /* KERNEL */
 
 #endif /* _NETKEY_KEYDB_H_ */