diff options
author | sangwan.kwon <sangwan.kwon@samsung.com> | 2015-12-18 11:39:57 +0900 |
---|---|---|
committer | sangwan.kwon <sangwan.kwon@samsung.com> | 2015-12-18 11:41:53 +0900 |
commit | 2b3ef38d58c1bb0abff4bf611177fc76e78325fa (patch) | |
tree | dc2b1d6496576d94e6fc10a6a6e0aee6e266da08 /util | |
parent | 28308412c8ac97a350f1219070d5a4fe6286f994 (diff) | |
download | openssl-2b3ef38d58c1bb0abff4bf611177fc76e78325fa.tar.gz openssl-2b3ef38d58c1bb0abff4bf611177fc76e78325fa.tar.bz2 openssl-2b3ef38d58c1bb0abff4bf611177fc76e78325fa.zip |
Imported Upstream version 1.0.2eupstream/1.0.2e
Change-Id: Ib2b4a8546eecf9f4d4a80d8f91b48dbf50bff173
Diffstat (limited to 'util')
-rwxr-xr-x | util/domd | 3 | ||||
-rw-r--r-- | util/indent.pro | 16 | ||||
-rwxr-xr-x | util/mk1mf.pl | 2 | ||||
-rwxr-xr-x | util/mkrc.pl | 2 | ||||
-rwxr-xr-x | util/mkstack.pl | 2 | ||||
-rw-r--r-- | util/pl/VC-32.pl | 7 | ||||
-rw-r--r-- | util/selftest.pl | 1 | ||||
-rw-r--r-- | util/toutf8.sh | 17 |
8 files changed, 44 insertions, 6 deletions
@@ -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/util/indent.pro b/util/indent.pro index e871431..4dcda5d 100644 --- a/util/indent.pro +++ b/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/util/mk1mf.pl b/util/mk1mf.pl index 9b8abc0..99652af 100755 --- a/util/mk1mf.pl +++ b/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/util/mkrc.pl b/util/mkrc.pl index 0ceadcf..83ee6a4 100755 --- a/util/mkrc.pl +++ b/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/util/mkstack.pl b/util/mkstack.pl index 2bd96cd..f4520d4 100755 --- a/util/mkstack.pl +++ b/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/util/pl/VC-32.pl b/util/pl/VC-32.pl index da05e9d..284fe03 100644 --- a/util/pl/VC-32.pl +++ b/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/util/selftest.pl b/util/selftest.pl index 7b32e9f..59842ef 100644 --- a/util/selftest.pl +++ b/util/selftest.pl @@ -199,3 +199,4 @@ while (<IN>) { } print "\nTest report in file $report\n"; +die if $ok != 2; diff --git a/util/toutf8.sh b/util/toutf8.sh new file mode 100644 index 0000000..8a4254b --- /dev/null +++ b/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 |