Merge branch 'master' of github.com:XX-net/XX-Net

Chingpo-Lai · Aug 20, 2015 · 1f8c5c0 · 1f8c5c0
2 parents 1d2b6ff + 4c1d4ad
commit 1f8c5c0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 data
 *~
 *.pyc
+*.swp
diff --git a/README.md b/README.md
@@ -56,6 +56,7 @@ https://github.com/XX-net/XX-Net/releases
   - Firefox 需手动导入证书 data/gae_proxy/CA.crt 启动后生成
 * Linux下, 执行 start.sh
   - 自动导入证书，需安装 libnss3-tools 包
+  - 没有安装PyGtk的，需要先安装gtk：sudo apt-get install python-gtk2
   - 第一次启动, 请用sudo ./start.sh, 以安装CA证书
   - 配置http代理 localhost 8087, 勾选全部协议使用这个代理。
     推荐Chrome + SwitchyOmega

diff --git a/gae_proxy/local/cert_util.py b/gae_proxy/local/cert_util.py
@@ -172,12 +172,17 @@ def create_ca():
         req.set_pubkey(key)
         req.sign(key, CertUtil.ca_digest)
         ca = OpenSSL.crypto.X509()
+        ca.set_version(2)
         ca.set_serial_number(0)
         ca.gmtime_adj_notBefore(0)
         ca.gmtime_adj_notAfter(24 * 60 * 60 * 3652)
         ca.set_issuer(req.get_subject())
         ca.set_subject(req.get_subject())
         ca.set_pubkey(req.get_pubkey())
+        ca.add_extensions([
+            OpenSSL.crypto.X509Extension(
+                'basicConstraints', False, 'CA:TRUE', ca, ca)
+            ])
         ca.sign(key, CertUtil.ca_digest)
         #logging.debug("CA key:%s", key)
         xlog.info("create ca")

diff --git a/php_proxy/local/cert_util.py b/php_proxy/local/cert_util.py
@@ -172,12 +172,17 @@ def create_ca():
         req.set_pubkey(key)
         req.sign(key, CertUtil.ca_digest)
         ca = OpenSSL.crypto.X509()
+        ca.set_version(2)
         ca.set_serial_number(0)
         ca.gmtime_adj_notBefore(0)
         ca.gmtime_adj_notAfter(24 * 60 * 60 * 3652)
         ca.set_issuer(req.get_subject())
         ca.set_subject(req.get_subject())
         ca.set_pubkey(req.get_pubkey())
+        ca.add_extensions([
+            OpenSSL.crypto.X509Extension(
+                'basicConstraints', False, 'CA:TRUE', ca, ca)
+            ])
         ca.sign(key, CertUtil.ca_digest)
         return key, ca
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     data
     *~
     *.pyc
+    *.swp