diff options
| author | michael-hart <michael.hart1994@gmail.com> | 2014-09-26 18:28:49 +0100 |
|---|---|---|
| committer | michael-hart <michael.hart1994@gmail.com> | 2014-09-26 18:28:49 +0100 |
| commit | 190e0d44b14ad071d45acfff1c5ace3f01c95c20 (patch) | |
| tree | 32673233373345e277af0176a46351841e46d0c1 | |
| parent | f5362b2a9bb490cc27a3a794258b8e052528eac2 (diff) | |
| download | cryptography-190e0d44b14ad071d45acfff1c5ace3f01c95c20.tar.gz cryptography-190e0d44b14ad071d45acfff1c5ace3f01c95c20.tar.bz2 cryptography-190e0d44b14ad071d45acfff1c5ace3f01c95c20.zip | |
Added missing newline, corrected changes
| -rwxr-xr-x | .travis/install.sh | 15 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/asymmetric/PEM_Serialization/README.txt | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index fafc4cad..0c64ba93 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -33,7 +33,10 @@ if [[ "${TOX_ENV}" == "docs" ]]; then fi if [[ "$DARWIN" = true ]]; then - if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi + if which pyenv > /dev/null; then + eval "$(pyenv init -)" + fi + case "${TOX_ENV}" in py26) curl -O https://bootstrap.pypa.io/get-pip.py @@ -46,8 +49,10 @@ if [[ "$DARWIN" = true ]]; then sudo pip install virtualenv ;; pypy) - pyenv install pypy-2.3.1 - pyenv global pypy-2.3.1 + brew update + brew upgrade pyenv + pyenv install pypy-2.4.0 + pyenv global pypy-2.4.0 pip install virtualenv ;; py32) @@ -105,7 +110,3 @@ fi virtualenv ~/.venv source ~/.venv/bin/activate pip install tox coveralls - -if [[ "$DARWIN" = true ]]; then - pyenv rehash -fi diff --git a/vectors/cryptography_vectors/asymmetric/PEM_Serialization/README.txt b/vectors/cryptography_vectors/asymmetric/PEM_Serialization/README.txt index 865fbc9e..14f91514 100644 --- a/vectors/cryptography_vectors/asymmetric/PEM_Serialization/README.txt +++ b/vectors/cryptography_vectors/asymmetric/PEM_Serialization/README.txt @@ -12,4 +12,4 @@ Contains 6. dsaparam.pem - Contains 2048-bit DSA parameters generated using OpenSSL; contains no keys. 7. dsa_private_key.pem - Contains a DSA 2048 bit key generated using OpenSSL from the parameters in dsaparam.pem, protected by the secret "123456" with DES3 encryption. -8. dsa_public_key.pem - Contains a DSA 2048 bit key generated using OpenSSL from dsa_private_key.pem.
\ No newline at end of file +8. dsa_public_key.pem - Contains a DSA 2048 bit key generated using OpenSSL from dsa_private_key.pem. |