diff options
| author | Brent Cook <busterb@gmail.com> | 2015-04-30 04:44:35 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2015-05-23 19:26:51 -0500 |
| commit | 28353c1df15c3d0482a10ffe33fa34c053af2c2e (patch) | |
| tree | 580bf87a6db90c492dd55594f9612d2442331376 /update.sh | |
| parent | 7de7605b95f2cd2d061720376544d511f71dc063 (diff) | |
| download | portable-28353c1df15c3d0482a10ffe33fa34c053af2c2e.tar.gz portable-28353c1df15c3d0482a10ffe33fa34c053af2c2e.tar.bz2 portable-28353c1df15c3d0482a10ffe33fa34c053af2c2e.zip | |
stub in initial libtls standalone tree
Diffstat (limited to 'update.sh')
| -rwxr-xr-x | update.sh | 12 |
1 files changed, 9 insertions, 3 deletions
| @@ -43,6 +43,7 @@ source $libtls_src/shlib_version | |||
| 43 | libtls_version=$major:$minor:0 | 43 | libtls_version=$major:$minor:0 |
| 44 | echo "libtls version $libtls_version" | 44 | echo "libtls version $libtls_version" |
| 45 | echo $libtls_version > tls/VERSION | 45 | echo $libtls_version > tls/VERSION |
| 46 | echo $libtls_version > libtls-standalone/VERSION | ||
| 46 | 47 | ||
| 47 | do_mv() { | 48 | do_mv() { |
| 48 | if ! cmp -s "$1" "$2" | 49 | if ! cmp -s "$1" "$2" |
| @@ -62,6 +63,7 @@ $CP $libssl_src/src/crypto/opensslfeatures.h include/openssl | |||
| 62 | $CP $libssl_src/src/e_os2.h include/openssl | 63 | $CP $libssl_src/src/e_os2.h include/openssl |
| 63 | $CP $libssl_src/src/ssl/pqueue.h include | 64 | $CP $libssl_src/src/ssl/pqueue.h include |
| 64 | $CP $libtls_src/tls.h include | 65 | $CP $libtls_src/tls.h include |
| 66 | $CP $libtls_src/tls.h libtls-standalone/include | ||
| 65 | 67 | ||
| 66 | for i in explicit_bzero.c strlcpy.c strlcat.c strndup.c strnlen.c \ | 68 | for i in explicit_bzero.c strlcpy.c strlcat.c strndup.c strnlen.c \ |
| 67 | timingsafe_bcmp.c timingsafe_memcmp.c; do | 69 | timingsafe_bcmp.c timingsafe_memcmp.c; do |
| @@ -73,6 +75,9 @@ $CP $libc_src/crypt/chacha_private.h crypto/compat | |||
| 73 | $CP $libcrypto_src/crypto/getentropy_*.c crypto/compat | 75 | $CP $libcrypto_src/crypto/getentropy_*.c crypto/compat |
| 74 | $CP $libcrypto_src/crypto/arc4random_*.h crypto/compat | 76 | $CP $libcrypto_src/crypto/arc4random_*.h crypto/compat |
| 75 | 77 | ||
| 78 | $CP $libcrypto_src/crypto/getentropy_*.c libtls-standalone/src/compat | ||
| 79 | $CP $libcrypto_src/crypto/arc4random_*.h libtls-standalone/src/compat | ||
| 80 | |||
| 76 | (cd $libssl_src/src/crypto/objects/; | 81 | (cd $libssl_src/src/crypto/objects/; |
| 77 | perl objects.pl objects.txt obj_mac.num obj_mac.h; | 82 | perl objects.pl objects.txt obj_mac.num obj_mac.h; |
| 78 | perl obj_dat.pl obj_mac.h obj_dat.h ) | 83 | perl obj_dat.pl obj_mac.h obj_dat.h ) |
| @@ -166,14 +171,15 @@ done | |||
| 166 | 171 | ||
| 167 | # copy libtls source | 172 | # copy libtls source |
| 168 | echo copying libtls source | 173 | echo copying libtls source |
| 169 | rm -f tls/*.c tls/*.h | 174 | rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h |
| 170 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do | 175 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do |
| 171 | if [ -e $libtls_src/$i ]; then | 176 | if [ -e $libtls_src/$i ]; then |
| 172 | $CP $libtls_src/$i tls | 177 | $CP $libtls_src/$i tls |
| 173 | else | 178 | $CP $libtls_src/$i libtls-standalone/src |
| 174 | $CP $libc_src/string/$i tls | ||
| 175 | fi | 179 | fi |
| 176 | done | 180 | done |
| 181 | $CP $libc_src/string/strsep.c tls | ||
| 182 | $CP $libc_src/string/strsep.c libtls-standalone/src/compat | ||
| 177 | 183 | ||
| 178 | # copy openssl(1) source | 184 | # copy openssl(1) source |
| 179 | echo "copying openssl(1) source" | 185 | echo "copying openssl(1) source" |