diff options
author | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
commit | 8d77ecefb78a0e7ec702cf614a78dd85de9395ee (patch) | |
tree | ade84397c16fe1b20cb2a441f603826e49c36cf2 /crypto/openssl/util | |
parent | 5374819b03f4e6dcb332bf2729f9270e5d10b83a (diff) | |
parent | afd52a5fc90e70242dbb0e7d29987c976eb993e0 (diff) | |
download | FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.zip FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.tar.gz |
Merge OpenSSL 1.0.2e.
Diffstat (limited to 'crypto/openssl/util')
-rwxr-xr-x | crypto/openssl/util/domd | 3 | ||||
-rw-r--r-- | crypto/openssl/util/indent.pro | 16 | ||||
-rwxr-xr-x | crypto/openssl/util/mk1mf.pl | 2 | ||||
-rwxr-xr-x | crypto/openssl/util/mkrc.pl | 2 | ||||
-rwxr-xr-x | crypto/openssl/util/mkstack.pl | 2 | ||||
-rw-r--r-- | crypto/openssl/util/pl/VC-32.pl | 7 | ||||
-rwxr-xr-x | crypto/openssl/util/pod2mantest | 58 | ||||
-rw-r--r-- | crypto/openssl/util/selftest.pl | 1 | ||||
-rwxr-xr-x | crypto/openssl/util/toutf8.sh | 17 |
9 files changed, 44 insertions, 64 deletions
diff --git a/crypto/openssl/util/domd b/crypto/openssl/util/domd index bab48cb..6a628c7 100755 --- a/crypto/openssl/util/domd +++ b/crypto/openssl/util/domd @@ -14,7 +14,8 @@ if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi cp Makefile Makefile.save # fake the presence of Kerberos touch $TOP/krb5.h -if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then +if ${MAKEDEPEND} --version 2>&1 | grep -q "clang" || + echo $MAKEDEPEND | grep -q "gcc"; then args="" while [ $# -gt 0 ]; do if [ "$1" != "--" ]; then args="$args $1"; fi diff --git a/crypto/openssl/util/indent.pro b/crypto/openssl/util/indent.pro index e871431..4dcda5d 100644 --- a/crypto/openssl/util/indent.pro +++ b/crypto/openssl/util/indent.pro @@ -749,3 +749,19 @@ -T ssl_trace_tbl -T _stdcall -T tls12_lookup +-T OPTIONS +-T OPT_PAIR +-T uint64_t +-T int64_t +-T uint32_t +-T int32_t +-T uint16_t +-T int16_t +-T uint8_t +-T int8_t +-T STRINT_PAIR +-T felem +-T felem_bytearray +-T SH_LIST +-T PACKET +-T RECORD_LAYER diff --git a/crypto/openssl/util/mk1mf.pl b/crypto/openssl/util/mk1mf.pl index 9b8abc0..99652af 100755 --- a/crypto/openssl/util/mk1mf.pl +++ b/crypto/openssl/util/mk1mf.pl @@ -447,7 +447,7 @@ $defs= <<"EOF"; # N.B. You MUST use -j on FreeBSD. # This makefile has been automatically generated from the OpenSSL distribution. # This single makefile will build the complete OpenSSL distribution and -# by default leave the 'intertesting' output files in .${o}out and the stuff +# by default leave the 'interesting' output files in .${o}out and the stuff # that needs deleting in .${o}tmp. # The file was generated by running 'make makefile.one', which # does a 'make files', which writes all the environment variables from all diff --git a/crypto/openssl/util/mkrc.pl b/crypto/openssl/util/mkrc.pl index 0ceadcf..83ee6a4 100755 --- a/crypto/openssl/util/mkrc.pl +++ b/crypto/openssl/util/mkrc.pl @@ -57,7 +57,7 @@ BEGIN VALUE "ProductVersion", "$version\\0" // Optional: //VALUE "Comments", "\\0" - VALUE "LegalCopyright", "Copyright © 1998-2006 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0" + VALUE "LegalCopyright", "Copyright © 1998-2006 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0" //VALUE "LegalTrademarks", "\\0" //VALUE "PrivateBuild", "\\0" //VALUE "SpecialBuild", "\\0" diff --git a/crypto/openssl/util/mkstack.pl b/crypto/openssl/util/mkstack.pl index 2bd96cd..f4520d4 100755 --- a/crypto/openssl/util/mkstack.pl +++ b/crypto/openssl/util/mkstack.pl @@ -98,7 +98,7 @@ while(<IN>) { EOF } - foreach $type_thing (sort @sstacklst) { + foreach $type_thing (sort { $a->[0] cmp $b->[0]} @sstacklst) { my $t1 = $type_thing->[0]; my $t2 = $type_thing->[1]; $new_stackfile .= <<EOF; diff --git a/crypto/openssl/util/pl/VC-32.pl b/crypto/openssl/util/pl/VC-32.pl index da05e9d..284fe03 100644 --- a/crypto/openssl/util/pl/VC-32.pl +++ b/crypto/openssl/util/pl/VC-32.pl @@ -358,15 +358,17 @@ sub do_link_rule local($ret,$_); $file =~ s/\//$o/g if $o ne '/'; $n=&bname($target); - $ret.="$target: $files $dep_libs\n"; + $ret.="$target: $files $dep_libs"; if ($standalone == 1) { + $ret.=" \$(OBJ_D)${o}applink.obj\n"; $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; - $ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild); + $ret.= "\$(EX_LIBS) \$(OBJ_D)${o}applink.obj " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild); $ret.="$files $libs\n<<\n"; } elsif ($standalone == 2) { + $ret.="\n"; $ret.="\tSET FIPS_LINK=\$(LINK)\n"; $ret.="\tSET FIPS_CC=\$(CC)\n"; $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; @@ -379,6 +381,7 @@ sub do_link_rule } else { + $ret.="\n"; $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n"; $ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n"; } diff --git a/crypto/openssl/util/pod2mantest b/crypto/openssl/util/pod2mantest deleted file mode 100755 index 384e683..0000000 --- a/crypto/openssl/util/pod2mantest +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# This script is used by test/Makefile to check whether a sane 'pod2man' -# is installed. -# ('make install' should not try to run 'pod2man' if it does not exist or if -# it is a broken 'pod2man' version that is known to cause trouble. if we find -# the system 'pod2man' to be broken, we use our own copy instead) -# -# In any case, output an appropriate command line for running (or not -# running) pod2man. - - -IFS=: -if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi - -try_without_dir=true -# First we try "pod2man", then "$dir/pod2man" for each item in $PATH. -for dir in dummy${IFS}$PATH; do - if [ "$try_without_dir" = true ]; then - # first iteration - pod2man=pod2man - try_without_dir=false - else - # second and later iterations - pod2man="$dir/pod2man" - if [ ! -f "$pod2man" ]; then # '-x' is not available on Ultrix - pod2man='' - fi - fi - - if [ ! "$pod2man" = '' ]; then - failure=none - - if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | fgrep OpenSSL >/dev/null; then - : - else - failure=BasicTest - fi - - if [ "$failure" = none ]; then - if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | grep '^MARKER - ' >/dev/null; then - failure=MultilineTest - fi - fi - - - if [ "$failure" = none ]; then - echo "$pod2man" - exit 0 - fi - - echo "$pod2man does not work properly ('$failure' failed). Looking for another pod2man ..." >&2 - fi -done - -echo "No working pod2man found. Consider installing a new version." >&2 -echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2 -echo "$1 ../../util/pod2man.pl" diff --git a/crypto/openssl/util/selftest.pl b/crypto/openssl/util/selftest.pl index 7b32e9f..59842ef 100644 --- a/crypto/openssl/util/selftest.pl +++ b/crypto/openssl/util/selftest.pl @@ -199,3 +199,4 @@ while (<IN>) { } print "\nTest report in file $report\n"; +die if $ok != 2; diff --git a/crypto/openssl/util/toutf8.sh b/crypto/openssl/util/toutf8.sh new file mode 100755 index 0000000..8a4254b --- /dev/null +++ b/crypto/openssl/util/toutf8.sh @@ -0,0 +1,17 @@ +#! /bin/sh +# +# Very simple script to detect and convert files that we want to re-encode to UTF8 + +git ls-tree -r --name-only HEAD | \ + while read F; do + charset=`file -bi "$F" | sed -e 's|.*charset=||'` + if [ "$charset" != "utf-8" -a "$charset" != "binary" -a "$charset" != "us-ascii" ]; then + iconv -f ISO-8859-1 -t UTF8 < "$F" > "$F.utf8" && \ + ( cmp -s "$F" "$F.utf8" || \ + ( echo "$F" + mv "$F" "$F.iso-8859-1" + mv "$F.utf8" "$F" + ) + ) + fi + done |