Skip to content

Commit

Permalink
update openssl to v1.1.0j (#1)
Browse files Browse the repository at this point in the history
* update openssl to v1.1.0j

* Add apt-get update

* Try to fix tests

* Make .travis/test.sh executable

* Update travis.yml

* Maybe like this

* Nope.
  • Loading branch information
jakolehm authored and kke committed Jan 3, 2019
1 parent 70c20be commit acd5983
Show file tree
Hide file tree
Showing 5,085 changed files with 27,433 additions and 9,173 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@ sudo: enabled
before_install: "./.travis/install_deps.sh"
stages:
- name: test
if: type = pull_request
- name: deploy
if: tag IS present
jobs:
include:
- stage: test
if: type = pull_request
script: rake test
name: test osx
script: "./.travis/test.sh"
os: osx
- stage: test
if: type = pull_request
script: rake test
name: test linux
script: "./.travis/test.sh"
os: linux
dist: xenial
- stage: deploy
name: deploy osx
os: osx
script: "./.travis/deploy.sh"
- stage: deploy
name: deploy linux
os: linux
dist: xenial
script: "./.travis/deploy.sh"
Expand Down
1 change: 1 addition & 0 deletions .travis/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew install texinfo
brew install openssl
else
sudo apt-get update
sudo apt-get install -y -q openssl squashfs-tools curl install-info info
fi

30 changes: 30 additions & 0 deletions .travis/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/sh

set -uex

if [ "$TRAVIS_OS_NAME" = "osx" ]; then
OPENSSLDIR="/usr/local/etc/openssl"
TEMP_DIR="$(mktemp -d)"
else
OPENSSLDIR="/etc/ssl"
TEMP_DIR="$(mktemp -d --tmpdir=$HOME .rubyc-build.XXXXXX)"
fi

mksquashfs -version

ruby -Ilib bin/rubyc bin/rubyc \
--openssl-dir=${OPENSSLDIR} \
--tmpdir=${TEMP_DIR} \
--clean-tmpdir \
--ignore-file=.git \
--ignore-file=.travis.yml \
--ignore-file=.travis/deploy.sh \
--ignore-file=.travis/install_deps.sh \
-o rubyc

strip rubyc || true

./rubyc --version

bundle exec rake test

4 changes: 3 additions & 1 deletion rakelib/test.rake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'minitest'

namespace "test" do
Rake::TestTask.new "roundtrip" do |task|
task.pattern = "test/roundtrip/test_*.rb"
Expand All @@ -12,7 +14,7 @@ namespace "test" do
task "unit" do
$LOAD_PATH.unshift 'lib'

Rake::FileList["test/unit/test_*.rb"].each do |test|
Rake::FileList[File.expand_path(File.join('..', "test/unit/test_*.rb"))].each do |test|
require_relative test
end

Expand Down
176 changes: 176 additions & 0 deletions vendor/openssl/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
# Ignore editor artefacts
/.dir-locals.el

# Top level excludes
/Makefile.orig
/MINFO
/TABLE
/*.a
/*.pc
/rehash.time
/inc.*
/makefile.*
/out.*
/tmp.*
/configdata.pm

# *all* Makefiles
Makefile
# ... except in demos
!/demos/*/Makefile

# Links under apps
/apps/CA.pl
/apps/tsget
/apps/tsget.pl
/apps/md4.c

# Auto generated headers
/crypto/buildinf.h
/apps/progs.h
/crypto/include/internal/*_conf.h
/openssl/include/opensslconf.h
/util/domd

# Executables
/apps/openssl
/test/sha256t
/test/sha512t
/test/gost2814789t
/test/ssltest_old
/test/*test
/test/fips_aesavs
/test/fips_desmovs
/test/fips_dhvs
/test/fips_drbgvs
/test/fips_dssvs
/test/fips_ecdhvs
/test/fips_ecdsavs
/test/fips_rngvs
/test/fips_test_suite
/test/ssltest_old
/test/x509aux
/test/v3ext
/test/versions
/test/rsa_complex

# Certain files that get created by tests on the fly
/test/test-runs
/test/buildtest_*

# Fuzz stuff.
# Anything without an extension is an executable on Unix, so we keep files
# with extensions. And we keep the corpora subddir versioned as well.
# Anything more generic with extensions that should be ignored will be taken
# care of by general ignores for those extensions (*.o, *.obj, *.exe, ...)
/fuzz/*
!/fuzz/README*
!/fuzz/corpora
!/fuzz/*.*

# Misc auto generated files
/include/openssl/opensslconf.h
/tools/c_rehash
/tools/c_rehash.pl
/util/shlib_wrap.sh
/tags
/TAGS
/crypto.map
/ssl.map

# Windows (legacy)
/tmp32
/tmp32.dbg
/tmp32dll
/tmp32dll.dbg
/out32
/out32.dbg
/out32dll
/out32dll.dbg
/inc32
/MINFO
/ms/.rnd
/ms/bcb.mak
/ms/libeay32.def
/ms/nt.mak
/ms/ntdll.mak
/ms/ssleay32.def
/ms/version32.rc

# Files created on other branches that are not held in git, and are not
# needed on this branch
/include/openssl/asn1_mac.h
/include/openssl/des_old.h
/include/openssl/fips.h
/include/openssl/fips_rand.h
/include/openssl/krb5_asn.h
/include/openssl/kssl.h
/include/openssl/pq_compat.h
/include/openssl/ssl23.h
/include/openssl/tmdiff.h
/include/openssl/ui_compat.h
/test/fips_aesavs.c
/test/fips_desmovs.c
/test/fips_dsatest.c
/test/fips_dssvs.c
/test/fips_hmactest.c
/test/fips_randtest.c
/test/fips_rngvs.c
/test/fips_rsagtest.c
/test/fips_rsastest.c
/test/fips_rsavtest.c
/test/fips_shatest.c
/test/fips_test_suite.c
/test/shatest.c

##### Generic patterns
# Auto generated assembly language source files
*.s
!/crypto/*/asm/*.s
/crypto/arm*.S
/crypto/*/*.S
*.asm
!/crypto/*/asm/*.asm

# Object files
*.o
*.obj

# editor artefacts
*.swp
.#*
\#*#
*~

# Certificate symbolic links
*.0

# All kinds of executables
*.so
*.so.*
*.dylib
*.dylib.*
*.dll
*.dll.*
*.exe
*.pyc
*.exp
*.lib
*.pdb
*.ilk
*.def
*.rc
*.res

# Misc generated stuff
Makefile.save
/crypto/**/lib
/engines/**/lib
/ssl/**/lib
*.bak
cscope.*
*.d
pod2htmd.tmp

# Windows manifest files
*.manifest
15 changes: 15 additions & 0 deletions vendor/openssl/.travis-apt-pin.preferences
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Package: clang-3.9
Pin: release o=Ubuntu
Pin-Priority: -1

Package: libclang-common-3.9-dev
Pin: release o=Ubuntu
Pin-Priority: -1

Package: libclang1-3.9
Pin: release o=Ubuntu
Pin-Priority: -1

Package: libllvm3.9v4
Pin: release o=Ubuntu
Pin-Priority: -1
Loading

0 comments on commit acd5983

Please sign in to comment.