saymrwulf/cryptography
1
0
Fork 0
mirror of https://github.com/saymrwulf/cryptography.git synced 2026-05-14 20:37:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various backports for 1.8.2 (#3615)

Browse source 
* Switch to jenkinsfile (#3525)

* [WIP] add a jenkinsfile

* various jenkinsfile fixes [ci skip]

* experiments

* escape the escaping

* can't do that with /usr/bin/env bash

* continue isolation

* bleh

* optimistically enable everything

* things

* add timeout, codecov

* derp

* sigh

* add credentials for codecov upload

* print the env

* nonsense

* checkout without jenkins because jenkins sucks

* maybe we're not allowed to shadow

* maybe if we actually pass the variable

* scope

* cd into a thing

* also here

* print the commit and run all the jobs again

* son of a

* add labels

* ch-ch-ch-changes

* damn it

* add docs, pep8, py3pep8

* try some downstreams

* make this maybe work

* this is probably what we need

* faster testing

* run this in docker duh

* delete me some dirs

* wtf

* god

* more things

* oh boy locales

* re-enable everything, remove the locales now that they're embedded

* refactor, this will probably break everything

* small test

* sigh

* actually bind some variables. also rename things to be camelCase

* oookay

* this is not gonna work

* test all the things

* add docs-linkcheck, remove libre 2.5.3 because it is bad

* syntax is for losers

* append a thing

* add yosemite, run this thing daily

* oops

* some finally cleanup

* twisted is dead to us for a brief moment

* add randomorder and setup.py test

* whatever

* re-enable twisted

* delete everything. eat arby's

* delete everything this time

* all is emptiness

* master builds should use the commit at the time it was merged (#3577)

* Fixes #3573 -- archive the built docs in that builder (#3580)

* Fixes #3573 -- archive the built docs in that builder

* syntax

* try it without this

* I am an idiot

* this is unused

* uhh, let's try this

* maybe this?

* eh, html is the only thing

* ffffuuuu

* Ignore doctree

* broader exclude

* This works now

* pin sphinx version to avoid test breakage (#3544)

* fix compilation on 1.1.0f (#3603)
This commit is contained in:
Paul Kehrer 2017-05-26 00:58:19 -05:00 committed by Alex Gaynor
parent 6c5a519f9b
commit d9787c4c4b
3 changed files with 377 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

372
Jenkinsfile vendored Normal file
View file

@ -0,0 +1,372 @@
if (env.BRANCH_NAME == "master") {
properties([pipelineTriggers([cron('@daily')])])
}
def configs = [
[
label: 'windows',
toxenvs: ['py26', 'py27', 'py33', 'py34', 'py35', 'py36'],
],
[
label: 'windows64',
toxenvs: ['py26', 'py27', 'py33', 'py34', 'py35', 'py36'],
],
[
label: 'freebsd11',
toxenvs: ['py27'],
],
[
label: 'sierra',
toxenvs: ['py27'],
],
[
label: 'yosemite',
toxenvs: ['py27'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-centos7',
toxenvs: ['py27'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-wheezy',
toxenvs: ['py27'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-jessie',
toxenvs: ['py27', 'py34'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-sid',
toxenvs: ['py27', 'py35'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-stretch',
toxenvs: ['py27', 'py35'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-jessie-libressl:2.4.5',
toxenvs: ['py27'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-ubuntu-xenial',
toxenvs: ['py27', 'py35'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-ubuntu-rolling',
toxenvs: ['py27', 'py35', 'pep8', 'py3pep8', 'randomorder'],
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-ubuntu-rolling',
toxenvs: ['docs'],
artifacts: 'cryptography/docs/_build/html/**',
artifactExcludes: '**/*.doctree',
],
[
label: 'docker',
imageName: 'pyca/cryptography-runner-fedora',
toxenvs: ['py27', 'py35'],
],
]
/* Add the linkcheck job to our config list if we're on master */
if (env.BRANCH_NAME == "master") {
configs.add(
[
label: 'docker',
imageName: 'pyca/cryptography-runner-ubuntu-rolling',
toxenvs: ['docs-linkcheck'],
]
)
}
def downstreams = [
[
downstreamName: 'pyOpenSSL',
label: 'docker',
imageName: 'pyca/cryptography-runner-ubuntu-rolling',
script: """#!/bin/bash -xe
git clone --depth=1 https://github.com/pyca/pyopenssl.git pyopenssl
cd pyopenssl
virtualenv .venv
source .venv/bin/activate
pip install ../cryptography
pip install -e .
pip install pytest
pytest tests
"""
],
[
downstreamName: 'Twisted',
label: 'docker',
imageName: 'pyca/cryptography-runner-ubuntu-rolling',
script: """#!/bin/bash -xe
git clone --depth=1 https://github.com/twisted/twisted.git twisted
cd twisted
virtualenv .venv
source .venv/bin/activate
pip install ../cryptography
pip install pyopenssl service_identity pycrypto
pip install -e .
python -m twisted.trial src/twisted
"""
],
[
downstreamName: 'paramiko',
label: 'docker',
imageName: 'pyca/cryptography-runner-ubuntu-rolling',
script: """#!/bin/bash -xe
git clone --depth=1 https://github.com/paramiko/paramiko.git paramiko
cd paramiko
virtualenv .venv
source .venv/bin/activate
pip install ../cryptography
pip install -e .
pip install -r dev-requirements.txt
inv test
"""
],
]
def checkout_git(label) {
def script = ""
if (env.BRANCH_NAME.startsWith('PR-')) {
script = """
git clone --depth=1 https://github.com/pyca/cryptography.git cryptography
cd cryptography
git fetch origin +refs/pull/${env.CHANGE_ID}/merge:
git checkout -qf FETCH_HEAD
"""
if (label.contains("windows")) {
bat script
} else {
sh """#!/bin/sh
set -xe
${script}
"""
}
} else {
checkout([
$class: 'GitSCM',
branches: [[name: "*/${env.BRANCH_NAME}"]],
doGenerateSubmoduleConfigurations: false,
extensions: [[
$class: 'RelativeTargetDirectory',
relativeTargetDir: 'cryptography'
]],
submoduleCfg: [],
userRemoteConfigs: [[
'url': 'https://github.com/pyca/cryptography'
]]
])
}
if (label.contains("windows")) {
bat """
cd cryptography
git rev-parse HEAD
"""
} else {
sh """
cd cryptography
git rev-parse HEAD
"""
}
}
def build(toxenv, label, imageName, artifacts, artifactExcludes) {
try {
timeout(time: 30, unit: 'MINUTES') {
checkout_git(label)
withCredentials([string(credentialsId: 'cryptography-codecov-token', variable: 'CODECOV_TOKEN')]) {
withEnv(["LABEL=$label", "TOXENV=$toxenv", "IMAGE_NAME=$imageName"]) {
if (label.contains("windows")) {
def pythonPath = [
py26: "C:\\Python26\\python.exe",
py27: "C:\\Python27\\python.exe",
py33: "C:\\Python33\\python.exe",
py34: "C:\\Python34\\python.exe",
py35: "C:\\Python35\\python.exe",
py36: "C:\\Python36\\python.exe"
]
if (toxenv == "py35" || toxenv == "py36") {
opensslPaths = [
"windows": [
"include": "C:\\OpenSSL-Win32-2015\\include",
"lib": "C:\\OpenSSL-Win32-2015\\lib"
],
"windows64": [
"include": "C:\\OpenSSL-Win64-2015\\include",
"lib": "C:\\OpenSSL-Win64-2015\\lib"
]
]
} else {
opensslPaths = [
"windows": [
"include": "C:\\OpenSSL-Win32-2010\\include",
"lib": "C:\\OpenSSL-Win32-2010\\lib"
],
"windows64": [
"include": "C:\\OpenSSL-Win64-2010\\include",
"lib": "C:\\OpenSSL-Win64-2010\\lib"
]
]
}
bat """
cd cryptography
@set PATH="C:\\Python27";"C:\\Python27\\Scripts";%PATH%
@set CRYPTOGRAPHY_WINDOWS_LINK_OPENSSL110=1
@set PYTHON="${pythonPath[toxenv]}"
@set INCLUDE="${opensslPaths[label]['include']}";%INCLUDE%
@set LIB="${opensslPaths[label]['lib']}";%LIB%
tox -r
IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
virtualenv .codecov
call .codecov/Scripts/activate
pip install codecov
codecov -e JOB_BASE_NAME,LABEL
"""
} else if (label.contains("sierra") || label.contains("yosemite")) {
ansiColor {
sh """#!/usr/bin/env bash
set -xe
# Jenkins logs in as a non-interactive shell, so we don't even have /usr/local/bin in PATH
export PATH="/usr/local/bin:\${PATH}"
export PATH="/Users/jenkins/.pyenv/shims:\${PATH}"
cd cryptography
CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 \
LDFLAGS="/usr/local/opt/openssl\\@1.1/lib/libcrypto.a /usr/local/opt/openssl\\@1.1/lib/libssl.a" \
CFLAGS="-I/usr/local/opt/openssl\\@1.1/include -Werror -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-error=unused-function -Wno-error=unused-command-line-argument" \
tox -r -- --color=yes
virtualenv .venv
source .venv/bin/activate
pip install coverage
bash <(curl -s https://codecov.io/bash) -e JOB_BASE_NAME,LABEL
"""
}
} else {
ansiColor {
sh """#!/usr/bin/env bash
set -xe
cd cryptography
if [[ "\${IMAGE_NAME}" == *"libressl"* ]]; then
LD_LIBRARY_PATH="/usr/local/libressl/lib:\$LD_LIBRARY_PATH" \
LDFLAGS="-L/usr/local/libressl/lib" \
CFLAGS="-I/usr/local/libressl/include" \
tox -r -- --color=yes
else
tox -r -- --color=yes
fi
virtualenv .venv
source .venv/bin/activate
pip install coverage
bash <(curl -s https://codecov.io/bash) -e JOB_BASE_NAME,LABEL
"""
}
if (artifacts) {
archiveArtifacts artifacts: artifacts, excludes: artifactExcludes
}
}
}
}
}
} finally {
deleteDir()
}
}
def builders = [:]
for (config in configs) {
def label = config["label"]
def toxenvs = config["toxenvs"]
def artifacts = config["artifacts"]
def artifactExcludes = config["artifactExcludes"]
for (_toxenv in toxenvs) {
def toxenv = _toxenv
if (label.contains("docker")) {
def imageName = config["imageName"]
def combinedName = "${imageName}-${toxenv}"
builders[combinedName] = {
node(label) {
stage(combinedName) {
docker.image(imageName).inside {
build(toxenv, label, imageName, artifacts, artifactExcludes)
}
}
}
}
} else {
def combinedName = "${label}-${toxenv}"
builders[combinedName] = {
node(label) {
stage(combinedName) {
build(toxenv, label, '', null, null)
}
}
}
}
}
}
/* Add the python setup.py test builder */
builders["setup.py-test"] = {
node("docker") {
stage("python setup.py test") {
docker.image("pyca/cryptography-runner-ubuntu-rolling").inside {
try {
checkout_git("docker")
sh """#!/usr/bin/env bash
set -xe
cd cryptography
virtualenv .venv
source .venv/bin/activate
python setup.py test
"""
} finally {
deleteDir()
}
}
}
}
}
parallel builders
def downstreamBuilders = [:]
for (downstream in downstreams) {
def downstreamName = downstream["downstreamName"]
def imageName = downstream["imageName"]
def label = downstream["label"]
def script = downstream["script"]
downstreamBuilders[downstreamName] = {
node(label) {
docker.image(imageName).inside {
try {
timeout(time: 30, unit: 'MINUTES') {
checkout_git(label)
sh script
}
} finally {
deleteDir()
}
}
}
}
}
stage("Downstreams") {
parallel downstreamBuilders
}

2
setup.py
View file

@ -315,7 +315,7 @@ setup(
"doc8",
"pyenchant",
"readme_renderer >= 16.0",
"sphinx",
"sphinx != 1.6.1",
"sphinx_rtd_theme",
"sphinxcontrib-spelling",
],

6
src/_cffi_src/openssl/asn1.py
View file

@ -77,8 +77,6 @@ int ASN1_INTEGER_set(ASN1_INTEGER *, long);
/* ASN1 TIME */
ASN1_TIME *ASN1_TIME_new(void);
void ASN1_TIME_free(ASN1_TIME *);
ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *,
ASN1_GENERALIZEDTIME **);
ASN1_TIME *ASN1_TIME_set(ASN1_TIME *, time_t);
/* ASN1 UTCTIME */
@ -112,6 +110,10 @@ int ASN1_STRING_to_UTF8(unsigned char **, ASN1_STRING *);
long ASN1_ENUMERATED_get(ASN1_ENUMERATED *);
int i2a_ASN1_INTEGER(BIO *, ASN1_INTEGER *);
/* This became const ASN1_TIME in 1.1.0f */
ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *,
ASN1_GENERALIZEDTIME **);
ASN1_UTF8STRING *ASN1_UTF8STRING_new(void);
void ASN1_UTF8STRING_free(ASN1_UTF8STRING *);