Committer: Miika Komu <miika@xxxxxx> Date: Wed Mar 10 12:03:40 2010 +0200 Revision: 3894 Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: Removed remnants of icookie. Modified: D hipd/icookie.c.doxyme D hipd/icookie.h.doxyme M Android.mk M hipd/cookie.c M lib/conf/hipconf.c === modified file 'Android.mk' --- Android.mk 2010-03-07 11:20:52 +0000 +++ Android.mk 2010-03-10 10:03:40 +0000 @@ -34,7 +34,6 @@ netdev.c \ bos.c \ nat.c \ - icookie.c \ init.c \ maintenance.c \ accessor.c \ === modified file 'hipd/cookie.c' --- hipd/cookie.c 2010-03-09 18:26:22 +0000 +++ hipd/cookie.c 2010-03-10 10:03:40 +0000 @@ -74,16 +74,6 @@ return err; } -#ifndef CONFIG_HIP_ICOOKIE /* see also spam.c for overriding functions */ - -#if 0 -void hip_init_puzzle_defaults() -{ - return; -} - -#endif - int hip_get_cookie_difficulty(hip_hit_t *not_used) { /* Note: we could return a higher value if we detect DoS */ @@ -142,8 +132,6 @@ return (base) % HIP_R1TABLESIZE; } -#endif /* !CONFIG_HIP_ICOOKIE */ - /** * hip_fetch_cookie_entry - Get a copy of R1entry structure * @param ip_i Initiator's IPv6 @@ -243,7 +231,6 @@ return err; } -#ifndef CONFIG_HIP_ICOOKIE /* * @sign the signing function to use */ @@ -273,8 +260,6 @@ return 0; } -#endif /* !CONFIG_HIP_ICOOKIE */ - void hip_uninit_r1(struct hip_r1entry *hip_r1table) { int i; === modified file 'lib/conf/hipconf.c' --- lib/conf/hipconf.c 2010-03-09 18:26:22 +0000 +++ lib/conf/hipconf.c 2010-03-10 10:03:40 +0000 @@ -117,13 +117,8 @@ "new hi anon|pub rsa|dsa filebasename keylen\n" "new|add hi default (HI must be created as root)\n" "new hi default rsa_keybits dsa_keybits\n" -#ifdef CONFIG_HIP_ICOOKIE - "get|inc|dec|new puzzle all|<hit>\n" - "set puzzle all|<hit> new_value\n" -#else "get|inc|dec|new puzzle all\n" "set puzzle all new_value\n" -#endif "bos all\n" "nat none|plain-udp\n" "nat port local <port>\n"