diff options
Diffstat (limited to 'src/pluto/ike_alg.h')
| -rw-r--r-- | src/pluto/ike_alg.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/pluto/ike_alg.h b/src/pluto/ike_alg.h index 7ee2ca808..c3ce8bb38 100644 --- a/src/pluto/ike_alg.h +++ b/src/pluto/ike_alg.h @@ -22,20 +22,14 @@ struct ike_alg { u_int16_t algo_type; u_int16_t algo_id; -<<<<<<< HEAD -======= const char *plugin_name; ->>>>>>> upstream/4.5.1 struct ike_alg *algo_next; }; struct encrypt_desc { u_int16_t algo_type; u_int16_t algo_id; -<<<<<<< HEAD -======= const char *plugin_name; ->>>>>>> upstream/4.5.1 struct ike_alg *algo_next; size_t enc_blocksize; @@ -47,10 +41,7 @@ struct encrypt_desc { struct hash_desc { u_int16_t algo_type; u_int16_t algo_id; -<<<<<<< HEAD -======= const char *plugin_name; ->>>>>>> upstream/4.5.1 struct ike_alg *algo_next; size_t hash_digest_size; @@ -59,10 +50,7 @@ struct hash_desc { struct dh_desc { u_int16_t algo_type; u_int16_t algo_id; -<<<<<<< HEAD -======= const char *plugin_name; ->>>>>>> upstream/4.5.1 struct ike_alg *algo_next; size_t ke_size; @@ -73,11 +61,7 @@ struct dh_desc { #define IKE_ALG_DH_GROUP 2 #define IKE_ALG_MAX IKE_ALG_DH_GROUP -<<<<<<< HEAD -extern int ike_alg_add(struct ike_alg *a); -======= extern int ike_alg_add(struct ike_alg *a, const char *plugin_name); ->>>>>>> upstream/4.5.1 extern struct hash_desc *ike_alg_get_hasher(u_int alg); extern struct encrypt_desc *ike_alg_get_crypter(u_int alg); extern struct dh_desc *ike_alg_get_dh_group(u_int alg); |