diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-03-08 18:27:07 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-03-08 22:02:54 -0500 |
| commit | f7e4e4a2666aa5ea39536d425206e680d76769d9 (patch) | |
| tree | 13aa6671d47049af239073b96d907d63713f90c4 /update.sh | |
| parent | 031f0aaa8f9b2e907195dbda8b7c451a08d58bbb (diff) | |
| download | portable-f7e4e4a2666aa5ea39536d425206e680d76769d9.tar.gz portable-f7e4e4a2666aa5ea39536d425206e680d76769d9.tar.bz2 portable-f7e4e4a2666aa5ea39536d425206e680d76769d9.zip | |
initialize winsock earlier in openssl(1)
This allows commands like ocsp to work properly since we no longer
initialize Winsock as a side-effect of doing a BIO_gethostbyname.
Diffstat (limited to 'update.sh')
| -rwxr-xr-x | update.sh | 20 |
1 files changed, 11 insertions, 9 deletions
| @@ -18,15 +18,15 @@ fi | |||
| 18 | git pull --rebase) | 18 | git pull --rebase) |
| 19 | 19 | ||
| 20 | # setup source paths | 20 | # setup source paths |
| 21 | dir=`pwd` | 21 | CWD=`pwd` |
| 22 | libc_src=$dir/openbsd/src/lib/libc | 22 | libc_src=$CWD/openbsd/src/lib/libc |
| 23 | libc_regress=$dir/openbsd/src/regress/lib/libc | 23 | libc_regress=$CWD/openbsd/src/regress/lib/libc |
| 24 | libcrypto_src=$dir/openbsd/src/lib/libcrypto | 24 | libcrypto_src=$CWD/openbsd/src/lib/libcrypto |
| 25 | libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto | 25 | libcrypto_regress=$CWD/openbsd/src/regress/lib/libcrypto |
| 26 | libssl_src=$dir/openbsd/src/lib/libssl | 26 | libssl_src=$CWD/openbsd/src/lib/libssl |
| 27 | libssl_regress=$dir/openbsd/src/regress/lib/libssl | 27 | libssl_regress=$CWD/openbsd/src/regress/lib/libssl |
| 28 | libtls_src=$dir/openbsd/src/lib/libtls | 28 | libtls_src=$CWD/openbsd/src/lib/libtls |
| 29 | openssl_app_src=$dir/openbsd/src/usr.bin/openssl | 29 | openssl_app_src=$CWD/openbsd/src/usr.bin/openssl |
| 30 | 30 | ||
| 31 | # load library versions | 31 | # load library versions |
| 32 | source $libcrypto_src/crypto/shlib_version | 32 | source $libcrypto_src/crypto/shlib_version |
| @@ -184,6 +184,8 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do | |||
| 184 | $CP $openssl_app_src/$i apps | 184 | $CP $openssl_app_src/$i apps |
| 185 | fi | 185 | fi |
| 186 | done | 186 | done |
| 187 | # patch for openssl(1) oscp on windows | ||
| 188 | (cd apps; patch -p5 < $CWD/patches/win_bio_sock_init.diff) | ||
| 187 | 189 | ||
| 188 | # copy libssl source | 190 | # copy libssl source |
| 189 | echo "copying libssl source" | 191 | echo "copying libssl source" |