]> wagner.pp.ru Git - oss/ctypescrypto.git/commitdiff
Merge branch 'master' of https://github.com/vbwagner/ctypescrypto
authorVictor Wagner <vitus@wagner.pp.ru>
Sun, 29 Apr 2018 05:17:41 +0000 (08:17 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Sun, 29 Apr 2018 05:17:41 +0000 (08:17 +0300)
1  2 
tests/testpkey.py

index 1018dc69a4caf94219de3fb09ed2a59f274f977f,622cccc784ffea2fe03632344ca95d9a6de6269c..7fda32c75ef2783bd5cfd9f4c5f5344d709f87e0
@@@ -1,7 -1,6 +1,7 @@@
  from ctypescrypto.pkey import PKey
- import unittest
+ import unittest,re
  from base64 import b64decode, b16decode
 +from subprocess import Popen,PIPE,CalledProcessError
  
  def pem2der(s):
      start=s.find('-----\n')