From: Victor Wagner <vitus@wagner.pp.ru>
Date: Sun, 29 Apr 2018 05:17:41 +0000 (+0300)
Subject: Merge branch 'master' of https://github.com/vbwagner/ctypescrypto
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=6c34e2a01664aeb3a5a14f7a79e76b394349b672;p=oss%2Fctypescrypto.git

Merge branch 'master' of https://github.com/vbwagner/ctypescrypto
---

6c34e2a01664aeb3a5a14f7a79e76b394349b672
diff --cc tests/testpkey.py
index 1018dc6,622cccc..7fda32c
--- a/tests/testpkey.py
+++ b/tests/testpkey.py
@@@ -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')