2692b2f1dd
This is a compromise needed to support building from non-stable tags. This incorporates the same logic used to generate openbsd tags in the first place, which are unstable because the CVS to git conversion does not have stable commit hashes.
459 lines
14 KiB
Bash
Executable File
459 lines
14 KiB
Bash
Executable File
#!/bin/sh
|
|
set -e
|
|
|
|
openbsd_branch=`cat OPENBSD_BRANCH`
|
|
|
|
# pull in latest upstream code
|
|
echo "pulling upstream openbsd source"
|
|
if [ ! -d openbsd ]; then
|
|
if [ -z "$LIBRESSL_GIT" ]; then
|
|
git clone https://github.com/libressl/openbsd.git
|
|
else
|
|
git clone $LIBRESSL_GIT/openbsd
|
|
fi
|
|
fi
|
|
|
|
# pull either the latest or if on a tag, the matching tag
|
|
set +e
|
|
tag=`git describe --exact-match --tags HEAD 2>/dev/null`
|
|
is_tag=$?
|
|
# adjust for 9 hour time delta between trees
|
|
release_ts=$((`git show -s --format=%ct $tag|tail -n1` + 32400))
|
|
commit=`git -C openbsd rev-list -n 1 --before=$release_ts $openbsd_branch`
|
|
git -C openbsd fetch
|
|
if [ $is_tag -eq 0 ]; then
|
|
echo "This is tag $tag, trying OpenBSD tag libressl-$tag"
|
|
if ! git -C openbsd checkout "libressl-$tag"; then
|
|
echo "No matching OpenBSD tag found trying nearest commit $commit"
|
|
git -C openbsd checkout -q $commit
|
|
fi
|
|
else
|
|
echo "Not on a tag, grabbing latest (NOTE: this may be broken from time to time)"
|
|
git -C openbsd checkout $openbsd_branch
|
|
git -C openbsd pull
|
|
fi
|
|
set -e
|
|
|
|
# setup source paths
|
|
CWD=`pwd`
|
|
OPENBSD_SRC=$CWD/openbsd/src
|
|
libc_src=$OPENBSD_SRC/lib/libc
|
|
libc_regress=$OPENBSD_SRC/regress/lib/libc
|
|
libcrypto_src=$OPENBSD_SRC/lib/libcrypto
|
|
libcrypto_regress=$OPENBSD_SRC/regress/lib/libcrypto
|
|
libssl_src=$OPENBSD_SRC/lib/libssl
|
|
libssl_regress=$OPENBSD_SRC/regress/lib/libssl
|
|
libtls_src=$OPENBSD_SRC/lib/libtls
|
|
libtls_regress=$OPENBSD_SRC/regress/lib/libtls
|
|
bin_src=$OPENBSD_SRC/usr.bin
|
|
sbin_src=$OPENBSD_SRC/usr.sbin
|
|
|
|
# load library versions
|
|
. "$libcrypto_src/shlib_version"
|
|
libcrypto_version=$major:$minor:0
|
|
echo "libcrypto version $libcrypto_version"
|
|
echo $libcrypto_version > crypto/VERSION
|
|
|
|
. "$libssl_src/shlib_version"
|
|
libssl_version=$major:$minor:0
|
|
echo "libssl version $libssl_version"
|
|
echo $libssl_version > ssl/VERSION
|
|
|
|
. "$libtls_src/shlib_version"
|
|
libtls_version=$major:$minor:0
|
|
echo "libtls version $libtls_version"
|
|
echo $libtls_version > tls/VERSION
|
|
|
|
do_mv() {
|
|
if ! cmp -s "$1" "$2"
|
|
then
|
|
mv "$1" "$2"
|
|
else
|
|
rm -f "$1"
|
|
fi
|
|
}
|
|
MV='do_mv'
|
|
|
|
do_cp_libc() {
|
|
sed "/DEF_WEAK/d" < "$1" > "$2"/`basename "$1"`
|
|
}
|
|
CP_LIBC='do_cp_libc'
|
|
|
|
CP='cp -p'
|
|
GREP='grep'
|
|
if [ -x /opt/csw/bin/ggrep ]; then
|
|
GREP='/opt/csw/bin/ggrep'
|
|
fi
|
|
|
|
$CP $libssl_src/LICENSE COPYING
|
|
|
|
$CP $libcrypto_src/opensslfeatures.h include/openssl
|
|
$CP $libssl_src/pqueue.h include
|
|
|
|
$CP $libtls_src/tls.h include
|
|
|
|
for i in crypto/compat; do
|
|
for j in $libc_src/crypt/arc4random.c \
|
|
$libc_src/crypt/arc4random_uniform.c \
|
|
$libc_src/crypt/chacha_private.h \
|
|
$libc_src/stdlib/reallocarray.c \
|
|
$libc_src/stdlib/recallocarray.c \
|
|
$libc_src/stdlib/strtonum.c \
|
|
$libc_src/string/explicit_bzero.c \
|
|
$libc_src/string/strcasecmp.c \
|
|
$libc_src/string/strlcpy.c \
|
|
$libc_src/string/strlcat.c \
|
|
$libc_src/string/strndup.c \
|
|
$libc_src/string/strnlen.c \
|
|
$libc_src/string/strsep.c \
|
|
$libc_src/string/timingsafe_bcmp.c \
|
|
$libc_src/string/timingsafe_memcmp.c \
|
|
$libcrypto_src/arc4random/getentropy_*.c \
|
|
$libcrypto_src/arc4random/arc4random_*.h; do
|
|
$CP_LIBC $j $i
|
|
done
|
|
done
|
|
|
|
(cd $libcrypto_src/objects/;
|
|
perl objects.pl objects.txt obj_mac.num obj_mac.h;
|
|
perl obj_dat.pl obj_mac.h obj_dat.h )
|
|
mkdir -p include/openssl crypto/objects
|
|
$MV $libcrypto_src/objects/obj_mac.h ./include/openssl/obj_mac.h
|
|
$MV $libcrypto_src/objects/obj_dat.h ./crypto/objects/obj_dat.h
|
|
|
|
copy_hdrs() {
|
|
for file in $2; do
|
|
$CP $1/$file include/openssl
|
|
done
|
|
}
|
|
|
|
copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
|
|
ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h
|
|
objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
|
|
ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
|
|
pem/pem2.h hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h
|
|
x509/x509v3.h conf/conf.h ocsp/ocsp.h
|
|
aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h
|
|
bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h conf/conf_api.h des/des.h dh/dh.h
|
|
dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h
|
|
md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h
|
|
rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h
|
|
sm3/sm3.h sm4/sm4.h chacha/chacha.h evp/evp.h poly1305/poly1305.h
|
|
camellia/camellia.h gost/gost.h curve25519/curve25519.h
|
|
ct/ct.h kdf/kdf.h"
|
|
|
|
copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
|
|
|
|
# override upstream opensslv.h if a local version exists
|
|
if [ -f patches/opensslv.h ]; then
|
|
$CP patches/opensslv.h include/openssl
|
|
else
|
|
$CP $libcrypto_src/opensslv.h include/openssl
|
|
fi
|
|
|
|
awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION
|
|
echo "LibreSSL version `cat VERSION`"
|
|
|
|
# copy libcrypto source
|
|
echo copying libcrypto source
|
|
rm -f crypto/*.c crypto/*.h
|
|
touch crypto/empty.c
|
|
for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
|
|
dir=`dirname $i`
|
|
mkdir -p crypto/$dir
|
|
if [ $dir != "compat" ]; then
|
|
if [ -e $libcrypto_src/$i ]; then
|
|
$CP $libcrypto_src/$i crypto/$i
|
|
fi
|
|
fi
|
|
done
|
|
|
|
for i in $libcrypto_src/arch/*; do
|
|
arch=`basename $i`
|
|
mkdir -p include/arch/$arch
|
|
$CP $libcrypto_src/arch/$arch/opensslconf.h include/arch/$arch/
|
|
done
|
|
|
|
for i in $libcrypto_src/bn/arch/*; do
|
|
arch=`basename $i`
|
|
mkdir -p crypto/bn/arch/$arch
|
|
$CP $libcrypto_src/bn/arch/$arch/* crypto/bn/arch/$arch/
|
|
done
|
|
|
|
$CP crypto/compat/b_win.c crypto/bio
|
|
$CP crypto/compat/ui_openssl_win.c crypto/ui
|
|
# add the libcrypto symbol export list
|
|
$GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym
|
|
|
|
fixup_masm() {
|
|
cpp -I./crypto $1 \
|
|
| sed -e 's/^#/;/' \
|
|
| sed -e 's/|/OR/g' \
|
|
| sed -e 's/~/NOT/g' \
|
|
| sed -e 's/1 << \([0-9]*\)/1 SHL \1/g' \
|
|
> $2
|
|
}
|
|
|
|
# generate assembly crypto algorithms
|
|
asm_src=$libcrypto_src
|
|
gen_asm_stdout() {
|
|
CC=true perl $asm_src/$2 $1 > crypto/$3.tmp
|
|
[ $1 = "elf" ] && cat <<-EOF >> crypto/$3.tmp
|
|
#if defined(HAVE_GNU_STACK)
|
|
.section .note.GNU-stack,"",%progbits
|
|
#endif
|
|
EOF
|
|
if [ $1 = "masm" ]; then
|
|
fixup_masm crypto/$3.tmp crypto/$3
|
|
else
|
|
$MV crypto/$3.tmp crypto/$3
|
|
fi
|
|
}
|
|
gen_asm_mips() {
|
|
abi=$1
|
|
dir=$2
|
|
src=$3
|
|
dst=$4
|
|
CC=true perl $asm_src/$dir/asm/$src.pl $abi $dst.S
|
|
cat <<-EOF >> $dst.S
|
|
#if defined(HAVE_GNU_STACK)
|
|
.section .note.GNU-stack,"",%progbits
|
|
#endif
|
|
EOF
|
|
mv $dst.S crypto/$dir/$dst.S
|
|
}
|
|
gen_asm() {
|
|
CC=true perl $asm_src/$2 $1 crypto/$3.tmp
|
|
[ $1 = "elf" ] && cat <<-EOF >> crypto/$3.tmp
|
|
#if defined(HAVE_GNU_STACK)
|
|
.section .note.GNU-stack,"",%progbits
|
|
#endif
|
|
EOF
|
|
if [ $1 = "masm" ]; then
|
|
fixup_masm crypto/$3.tmp crypto/$3
|
|
else
|
|
$MV crypto/$3.tmp crypto/$3
|
|
fi
|
|
}
|
|
|
|
echo generating mips ASM source for elf
|
|
gen_asm_mips o32 aes aes-mips aes-mips
|
|
gen_asm_mips o32 bn mips bn-mips
|
|
gen_asm_mips o32 bn mips-mont mont-mips
|
|
gen_asm_mips o32 sha sha1-mips sha1-mips
|
|
gen_asm_mips o32 sha sha512-mips sha256-mips
|
|
gen_asm_mips o32 sha sha512-mips sha512-mips
|
|
|
|
echo generating mips64 ASM source for elf
|
|
gen_asm_mips 64 aes aes-mips aes-mips64
|
|
gen_asm_mips 64 bn mips bn-mips64
|
|
gen_asm_mips 64 bn mips-mont mont-mips64
|
|
gen_asm_mips 64 sha sha1-mips sha1-mips64
|
|
gen_asm_mips 64 sha sha512-mips sha256-mips64
|
|
gen_asm_mips 64 sha sha512-mips sha512-mips64
|
|
|
|
echo generating arm ASM source for elf
|
|
gen_asm_stdout elf aes/asm/aes-armv4.pl aes/aes-elf-armv4.S
|
|
gen_asm_stdout elf bn/asm/armv4-gf2m.pl bn/gf2m-elf-armv4.S
|
|
gen_asm_stdout elf bn/asm/armv4-mont.pl bn/mont-elf-armv4.S
|
|
gen_asm_stdout elf sha/asm/sha1-armv4-large.pl sha/sha1-elf-armv4.S
|
|
gen_asm_stdout elf sha/asm/sha256-armv4.pl sha/sha256-elf-armv4.S
|
|
gen_asm_stdout elf sha/asm/sha512-armv4.pl sha/sha512-elf-armv4.S
|
|
gen_asm_stdout elf modes/asm/ghash-armv4.pl modes/ghash-elf-armv4.S
|
|
$CP $libcrypto_src/arch/arm/armv4cpuid.S crypto
|
|
$CP $libcrypto_src/arch/arm/armcap.c crypto
|
|
$CP $libcrypto_src/arch/arm/arm_arch.h crypto
|
|
|
|
for abi in elf macosx masm mingw64; do
|
|
echo generating x86_64 ASM source for $abi
|
|
gen_asm_stdout $abi aes/asm/aes-x86_64.pl aes/aes-$abi-x86_64.S
|
|
gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl aes/vpaes-$abi-x86_64.S
|
|
gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl aes/bsaes-$abi-x86_64.S
|
|
gen_asm_stdout $abi aes/asm/aesni-x86_64.pl aes/aesni-$abi-x86_64.S
|
|
gen_asm_stdout $abi aes/asm/aesni-sha1-x86_64.pl aes/aesni-sha1-$abi-x86_64.S
|
|
gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl bn/modexp512-$abi-x86_64.S
|
|
gen_asm_stdout $abi bn/asm/x86_64-mont.pl bn/mont-$abi-x86_64.S
|
|
gen_asm_stdout $abi bn/asm/x86_64-mont5.pl bn/mont5-$abi-x86_64.S
|
|
gen_asm_stdout $abi bn/asm/x86_64-gf2m.pl bn/gf2m-$abi-x86_64.S
|
|
gen_asm_stdout $abi camellia/asm/cmll-x86_64.pl camellia/cmll-$abi-x86_64.S
|
|
gen_asm_stdout $abi md5/asm/md5-x86_64.pl md5/md5-$abi-x86_64.S
|
|
gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S
|
|
gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S
|
|
gen_asm_stdout $abi rc4/asm/rc4-md5-x86_64.pl rc4/rc4-md5-$abi-x86_64.S
|
|
gen_asm_stdout $abi sha/asm/sha1-x86_64.pl sha/sha1-$abi-x86_64.S
|
|
gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha256-$abi-x86_64.S
|
|
gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha512-$abi-x86_64.S
|
|
gen_asm_stdout $abi whrlpool/asm/wp-x86_64.pl whrlpool/wp-$abi-x86_64.S
|
|
gen_asm $abi x86_64cpuid.pl cpuid-$abi-x86_64.S
|
|
done
|
|
|
|
# copy libtls source
|
|
echo copying libtls source
|
|
rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h
|
|
touch tls/empty.c
|
|
for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
|
|
if [ -e $libtls_src/$i ]; then
|
|
$CP $libtls_src/$i tls
|
|
fi
|
|
done
|
|
# add the libtls symbol export list
|
|
$GREP '^[A-Za-z0-9_]' < $libtls_src/Symbols.list > tls/tls.sym
|
|
|
|
# copy nc(1) source
|
|
echo "copying nc(1) source"
|
|
$CP $bin_src/nc/nc.1 apps/nc
|
|
rm -f apps/nc/*.c apps/nc/*.h
|
|
$CP_LIBC $libc_src/net/base64.c apps/nc/compat
|
|
for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do
|
|
if [ -e $bin_src/nc/$i ]; then
|
|
$CP $bin_src/nc/$i apps/nc
|
|
fi
|
|
done
|
|
|
|
# copy ocspcheck(1) source
|
|
echo "copying ocspcheck(1) source"
|
|
$CP $sbin_src/ocspcheck/ocspcheck.8 apps/ocspcheck
|
|
rm -f apps/ocspcheck/*.c apps/ocspcheck/*.h
|
|
$CP_LIBC $libc_src/string/memmem.c apps/ocspcheck/compat
|
|
for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/ocspcheck/Makefile.am` ; do
|
|
if [ -e $sbin_src/ocspcheck/$i ]; then
|
|
$CP $sbin_src/ocspcheck/$i apps/ocspcheck
|
|
fi
|
|
done
|
|
|
|
# copy openssl(1) source
|
|
echo "copying openssl(1) source"
|
|
$CP $bin_src/openssl/openssl.1 apps/openssl
|
|
$CP $libcrypto_src/cert.pem .
|
|
$CP $libcrypto_src/openssl.cnf .
|
|
$CP $libcrypto_src/x509v3.cnf .
|
|
for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/openssl/Makefile.am` ; do
|
|
if [ -e $bin_src/openssl/$i ]; then
|
|
$CP $bin_src/openssl/$i apps/openssl
|
|
fi
|
|
done
|
|
|
|
# copy libssl source
|
|
echo "copying libssl source"
|
|
rm -f ssl/*.c ssl/*.h
|
|
touch ssl/empty.c
|
|
for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
|
|
dir=`dirname $i`
|
|
mkdir -p ssl/$dir
|
|
$CP $libssl_src/$i ssl/$i
|
|
done
|
|
# add the libssl symbol export list
|
|
$GREP '^[A-Za-z0-9_]' < $libssl_src/Symbols.list > ssl/ssl.sym
|
|
|
|
# copy libcrypto tests
|
|
echo "copying tests"
|
|
touch tests/empty.c
|
|
for i in `find $libcrypto_regress -name '*.c'`; do
|
|
$CP "$i" tests
|
|
done
|
|
$CP $libcrypto_regress/evp/evptests.txt tests
|
|
$CP $libcrypto_regress/aead/*.txt tests
|
|
|
|
# generate libcrypto freenull.c
|
|
awk -f $libcrypto_regress/free/freenull.awk \
|
|
< $libcrypto_src/Symbols.list > tests/freenull.c.body
|
|
cat $libcrypto_regress/free/freenull.c.head tests/freenull.c.body \
|
|
$libcrypto_regress/free/freenull.c.tail > tests/freenull.c.tmp
|
|
$MV tests/freenull.c.tmp tests/freenull.c
|
|
|
|
# copy libc tests
|
|
$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c
|
|
$CP $libc_regress/explicit_bzero/explicit_bzero.c tests
|
|
$CP_LIBC $libc_src/string/memmem.c tests/compat
|
|
$CP $libc_regress/timingsafe/timingsafe.c tests
|
|
|
|
# copy libssl tests
|
|
$CP $libssl_regress/ssl/testssl tests
|
|
for i in `find $libssl_regress -name '*.c'`; do
|
|
$CP "$i" tests
|
|
done
|
|
$CP $libssl_regress/unit/tests.h tests
|
|
$CP $libssl_regress/certs/*.pem tests
|
|
$CP $libssl_regress/certs/*.crl tests
|
|
$CP $libssl_regress/pqueue/expected.txt tests/pq_expected.txt
|
|
|
|
# copy libtls tests
|
|
for i in `find $libtls_regress -name '*.c'`; do
|
|
$CP "$i" tests
|
|
done
|
|
|
|
chmod 755 tests/testssl
|
|
|
|
# add headers
|
|
(cd include/openssl
|
|
$CP Makefile.am.tpl Makefile.am
|
|
for i in `ls -1 *.h|sort`; do
|
|
echo "opensslinclude_HEADERS += $i" >> Makefile.am
|
|
done
|
|
echo endif >> Makefile.am
|
|
)
|
|
|
|
add_man_links() {
|
|
filter=$1
|
|
dest=$2
|
|
echo "install-data-hook:" >> $dest
|
|
for i in `$GREP $filter man/links`; do
|
|
IFS=","; set $i; unset IFS
|
|
if [ "$2" != "" ]; then
|
|
echo " ln -sf \"$1\" \"\$(DESTDIR)\$(mandir)/man3/$2\"" >> $dest
|
|
fi
|
|
done
|
|
echo "" >> $dest
|
|
echo "uninstall-local:" >> $dest
|
|
for i in `$GREP $filter man/links`; do
|
|
IFS=","; set $i; unset IFS
|
|
if [ "$2" != "" ]; then
|
|
echo " -rm -f \"\$(DESTDIR)\$(mandir)/man3/$2\"" >> $dest
|
|
fi
|
|
done
|
|
}
|
|
|
|
# apply local patches
|
|
PATCH=patch
|
|
# Prefer gnu patch on AIX systems, if available
|
|
if [ -x /opt/freeware/bin/patch ]; then
|
|
PATCH=/opt/freeware/bin/patch
|
|
fi
|
|
for i in patches/*.patch; do
|
|
$PATCH -p0 < $i
|
|
done
|
|
|
|
# copy manpages
|
|
echo "copying manpages"
|
|
echo EXTRA_DIST = CMakeLists.txt > man/Makefile.am
|
|
echo "if !ENABLE_LIBTLS_ONLY" >> man/Makefile.am
|
|
echo dist_man3_MANS = >> man/Makefile.am
|
|
echo dist_man5_MANS = >> man/Makefile.am
|
|
(cd man
|
|
for i in `ls -1 $libssl_src/man/*.3 | sort`; do
|
|
NAME=`basename "$i"`
|
|
$CP $i .
|
|
echo "dist_man3_MANS += $NAME" >> Makefile.am
|
|
done
|
|
|
|
for i in `ls -1 $libcrypto_src/man/*.3 | sort`; do
|
|
NAME=`basename "$i"`
|
|
$CP $i .
|
|
echo "dist_man3_MANS += $NAME" >> Makefile.am
|
|
done
|
|
|
|
for i in `ls -1 $libtls_src/man/*.3 | sort`; do
|
|
NAME=`basename "$i"`
|
|
$CP $i .
|
|
echo "dist_man3_MANS += $NAME" >> Makefile.am
|
|
done
|
|
|
|
for i in `ls -1 $libcrypto_src/man/*.5 | sort`; do
|
|
NAME=`basename "$i"`
|
|
$CP $i .
|
|
echo "dist_man5_MANS += $NAME" >> Makefile.am
|
|
done
|
|
)
|
|
add_man_links . man/Makefile.am
|
|
echo endif >> man/Makefile.am
|