[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  10d2ec0cbe1be4479ab8b4577bf864154724af20 (commit)
       via  931b160a24369db792de52a37058111e90c8af09 (commit)
      from  9cc76cc40a033ade05a2799a4de5be5f29a35ed1 (commit)


- Log -----------------------------------------------------------------
commit 10d2ec0cbe1be4479ab8b4577bf864154724af20
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 3 22:03:50 2016 +0200

    indent: add a couple of types we use in apps
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

commit 931b160a24369db792de52a37058111e90c8af09
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 3 19:49:32 2016 +0200

    openssl-format-source: no dash marker on *INDENT-(ON|OFF)* comments
    
    We mark small comments with a dash immediately following the starting /*.
    However, *INDENT-(ON|OFF)* comments shouldn't be treated that way, or
    indent will ignore them if we do.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/indent.pro            | 2 ++
 util/openssl-format-source | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/indent.pro b/util/indent.pro
index 8c93f0c..2d44e6e 100644
--- a/util/indent.pro
+++ b/util/indent.pro
@@ -725,3 +725,5 @@
 -T ASYNC_FIBRE
 -T ASYNC_CTX
 -T ASYNC_JOB
+-T intmax_t
+-T uintmax_t
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 36ea432..77645af 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -122,7 +122,7 @@ do
 	      -e 's/(STACK_OF|LHASH_OF)\(([^ \t,\)]+)\)( |\n)/$1_$2_$3/g;' \
 	      | \
 	    perl -np \
-	      -e 's/^([ \t]*)\/\*([ \t]+.*)\*\/[ \t]*$/if (length("$1$2")<75) {$c="-"}else{$c=""}; "$1\/*$c$2*\/"/e;' \
+	      -e 's/^([ \t]*)\/\*([ \t]+.*)\*\/[ \t]*$/my ($x1,$x2) = ($1, $2); if (length("$x1$x2")<75 && $x2 !~ m#^\s*\*INDENT-(ON|OFF)\*\s*$#) {$c="-"}else{$c=""}; "$x1\/*$c$x2*\/"/e;' \
 	      -e 's/^\/\* ((Copyright|=|----).*)$/\/*-$1/;' \
 	      -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \