am 3860b6e6: rootdir: Obsolete ppp/peers/common and racoon/racoon.conf.
Merge commit '3860b6e67c72afceddf316c0a3282f53496de8af'
* commit '3860b6e67c72afceddf316c0a3282f53496de8af':
rootdir: Obsolete ppp/peers/common and racoon/racoon.conf.
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index d4c75a6..e66b1c3 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -6,8 +6,7 @@
copy_from := \
etc/dbus.conf \
etc/init.goldfish.sh \
- etc/ppp/peers/common \
- etc/racoon/racoon.conf \
+ etc/ppp/ip-up-vpn \
etc/hosts
copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from))
diff --git a/rootdir/etc/ppp/peers/common b/rootdir/etc/ppp/peers/common
deleted file mode 100755
index 4183841..0000000
--- a/rootdir/etc/ppp/peers/common
+++ /dev/null
@@ -1,10 +0,0 @@
-ipcp-accept-local
-ipcp-accept-remote
-refuse-eap
-noccp
-noauth
-idle 1800
-mtu 1400
-mru 1400
-nodefaultroute
-usepeerdns
diff --git a/rootdir/etc/racoon/racoon.conf b/rootdir/etc/racoon/racoon.conf
deleted file mode 100644
index eb50a2d..0000000
--- a/rootdir/etc/racoon/racoon.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#path certificate "";
-path certificate "/";
-
-sainfo anonymous {
- encryption_algorithm aes, 3des;
- authentication_algorithm hmac_sha1, hmac_md5;
- compression_algorithm deflate;
- lifetime time 3600 sec;
-}
-
-remote anonymous {
- exchange_mode main;
- doi ipsec_doi;
- situation identity_only;
- ike_frag on;
- generate_policy on;
- my_identifier asn1dn;
- nat_traversal on; # always use NAT-T
- ca_type x509 "ca.crt";
- certificate_type x509 "user.crt" "user.key";
- verify_identifier off;
- verify_cert on;
- nonce_size 16;
- initial_contact on;
- proposal_check obey;
-
- proposal {
- authentication_method rsasig;
- hash_algorithm sha1;
- encryption_algorithm 3des;
- lifetime time 3600 sec;
- dh_group 2;
- }
-}
-