Merge pull request #4 from tencentyun/weijunyi-dev

weijunyi · web-flow · commit ef0070681c4d · 2019-01-29T13:14:24.000+08:00
修改 README
diff --git a/README.md b/README.md
@@ -9,22 +9,8 @@ pip install tls-sig-api
 ```python
 import TLSSigAPI
 
-ecdsa_pri_key = """
------BEGIN PRIVATE KEY-----
-MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgK55Mnxa+AH7tvzvAyfxW
-aN1rZdL0Xv2hyg3k2eqjeHyhRANCAAQvkz6T2Or8EEzgF0lWBF0RtrxjJYUF6RqM
-2JUDAP4UD/cIwhGTYlWC2ZRPZEvaXZJapz2Y2c2TwcgW13sAnIKZ
------END PRIVATE KEY-----
-"""
 
-ecdsa_pub_key = """
------BEGIN PUBLIC KEY-----
-MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEL5M+k9jq/BBM4BdJVgRdEba8YyWFBeka
-jNiVAwD+FA/3CMIRk2JVgtmUT2RL2l2SWqc9mNnNk8HIFtd7AJyCmQ==
------END PUBLIC KEY-----
-"""
-
-api = TLSSigAPI.TLSSigAPI(1400000000, ecdsa_pri_key, ecdsa_pub_key)
+api = TLSSigAPI.TLSSigAPI(1400000000, pri_key_content, pub_key_content)
 sig = api.tls_gen_sig("xiaojun")
 print(sig)
 ```
@@ -34,22 +20,7 @@ print(sig)
 import TLSSigAPI
 
 
-ecdsa_pri_key = """
------BEGIN PRIVATE KEY-----
-MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgK55Mnxa+AH7tvzvAyfxW
-aN1rZdL0Xv2hyg3k2eqjeHyhRANCAAQvkz6T2Or8EEzgF0lWBF0RtrxjJYUF6RqM
-2JUDAP4UD/cIwhGTYlWC2ZRPZEvaXZJapz2Y2c2TwcgW13sAnIKZ
------END PRIVATE KEY-----
-"""
-
-ecdsa_pub_key = """
------BEGIN PUBLIC KEY-----
-MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEL5M+k9jq/BBM4BdJVgRdEba8YyWFBeka
-jNiVAwD+FA/3CMIRk2JVgtmUT2RL2l2SWqc9mNnNk8HIFtd7AJyCmQ==
------END PUBLIC KEY-----
-"""
-
-api = TLSSigAPI.TLSSigAPI(1400000000, ecdsa_pri_key, ecdsa_pub_key)
+api = TLSSigAPI.TLSSigAPI(1400000000, pri_key_content, pub_key_content)
 sig = api.tls_gen_sig("xiaojun", 24*3600*180)
 print(sig)
-```
+```
diff --git a/TLSSigAPI.py b/TLSSigAPI.py
@@ -9,16 +9,16 @@
 
 ecdsa_pri_key = """
 -----BEGIN PRIVATE KEY-----
-MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgK55Mnxa+AH7tvzvAyfxW
-aN1rZdL0Xv2hyg3k2eqjeHyhRANCAAQvkz6T2Or8EEzgF0lWBF0RtrxjJYUF6RqM
-2JUDAP4UD/cIwhGTYlWC2ZRPZEvaXZJapz2Y2c2TwcgW13sAnIKZ
------END PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgkTfHxPa8YusG+va8
+1CRztNQBOEr90TBEjlQBZ5d1Y0ChRANCAAS9isP/xLib7EZ1vS5OUy+gOsYBwees
+PMDvWiTygPAUsGZv1PHLoa0ciqsElkO1fMGwNrzOKJx1Oo194Ri+SypV
+-----END PRIVATE KEY----- 
 """
 
 ecdsa_pub_key = """
 -----BEGIN PUBLIC KEY-----
-MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEL5M+k9jq/BBM4BdJVgRdEba8YyWFBeka
-jNiVAwD+FA/3CMIRk2JVgtmUT2RL2l2SWqc9mNnNk8HIFtd7AJyCmQ==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEvYrD/8S4m+xGdb0uTlMvoDrGAcHn
+rDzA71ok8oDwFLBmb9Txy6GtHIqrBJZDtXzBsDa8ziicdTqNfeEYvksqVQ==
 -----END PUBLIC KEY-----
 """
 
@@ -135,7 +135,7 @@ def tls_verify_sig(self, tlssig, identifier):
         print(ret)
 
 def main():
-    api = TLSSigAPI(1400001052, ecdsa_pri_key, ecdsa_pub_key)
+    api = TLSSigAPI(1400000000, ecdsa_pri_key, ecdsa_pub_key)
     sig = api.tls_gen_sig("xiaojun")
     print(sig)
 
diff --git a/setup.py b/setup.py
@@ -1,19 +1,19 @@
 from setuptools import setup, find_packages
 
 setup (
-       name='tls-sig-api',
-       version='1.0',
-       packages=find_packages(),
+        name='tls-sig-api',
+        version='1.3',
+        packages=find_packages(),
 
-       author_email='okhowang@tencent.com',
+        author_email='weijunyi@tencent.com',
 
-       py_modules=[
-           'TLSSigAPI'
-           ],
-       install_requires=[
-           'pyOpenSSL',
-           ],
+        py_modules=[
+            'TLSSigAPI'
+            ],
+        install_requires=[
+            'pyOpenSSL',
+            ],
 
-       url='https://github.com/tencentyun/tls-sig-api-python',
-       license='MIT',
-       )
+        url='https://github.com/tencentyun/tls-sig-api-python',
+        license='MIT',
+        )
