Skip to content

Commit 30be3ce

Browse files
authored
Extend signers
* remove dependency on RSA and start to add support for non-RSA and non-PKCS1 v1.5 padding * remove unused test * remove unused test * improved logging and fix * test-cases * fixed ecdsa impl * Added .jenkins.yaml * Build in a xenial docker container * merge master * Disable as we want to use the official package * Python 3 combatibility for DataPrimitives * requires != install_requires * p3 setup fix * force utf8 * force utf8 * drop p2 * fix for mgf1 verification * Update CI dist and python versions * Update CI packages
1 parent f9a4074 commit 30be3ce

18 files changed

+826
-97
lines changed

.jenkins.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Disabled as we want to use the offical package
2+
disabled: true
3+
builders:
4+
- script
5+
triggers:
6+
cron: "@weekly"
7+
build_in_docker:
8+
image: docker.sunet.se/sunet/docker-jenkins-job-xenial
9+
publish_over_ssh:
10+
- pypi.sunet.se
11+
clean_workspace: true
12+
pre_build_script:
13+
- "add-apt-repository -y -u ppa:pkg-opendnssec/ppa"
14+
- "apt-get install -y xmlsec1 libxml2-dev libxslt-dev libsofthsm2 softhsm2 opensc libengine-pkcs11-openssl swig"
15+
script:
16+
- "virtualenv -p python3 venv"
17+
- ". venv/bin/activate"
18+
- "pip install --upgrade setuptools pip wheel"
19+
- "pip install pykcs11 nose"
20+
- "python setup.py nosetests -vv -d"
21+
- "python setup.py sdist bdist_wheel --universal"
22+

.travis.yml

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
sudo: false
2-
dist: xenial
2+
dist: bionic
33
language: python
44
python:
5-
- 2.7
6-
- 3.5
75
- 3.6
86
- 3.7
7+
- 3.8
8+
- 3.9
99

1010
addons:
1111
apt:
12-
sources:
13-
- sourceline: ppa:pkg-opendnssec/ppa
1412
packages:
13+
# build deps
14+
- swig
15+
# runtime deps
1516
- xmlsec1
16-
- libxml2-dev
17-
- libxslt-dev
17+
- libengine-pkcs11-openssl
1818
- libsofthsm2
1919
- softhsm2
2020
- opensc
21-
- libengine-pkcs11-openssl
22-
- swig
2321

2422
install:
2523
- pip install pykcs11

setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
from setuptools import setup, find_packages
33
import sys
44
import os
55
from distutils import versionpredicate
66

77
here = os.path.abspath(os.path.dirname(__file__))
8-
README = open(os.path.join(here, 'README.rst')).read()
9-
NEWS = open(os.path.join(here, 'NEWS.txt')).read()
8+
README = open(os.path.join(here, 'README.rst'),'rb').read().decode('utf-8')
9+
NEWS = open(os.path.join(here, 'NEWS.txt'),'rb').read().decode('utf-8')
1010

1111

12-
version = '0.21'
12+
version = '0.22dev0'
1313

1414
install_requires = [
1515
'defusedxml', 'lxml', 'pyconfig', 'requests', 'cryptography', 'six'

0 commit comments

Comments
 (0)