[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  850864d81c49697b08254eebf565e8251f2e30db (commit)
      from  25d498c1761bf04f415900d4b64d14ccdbce3e30 (commit)


- Log -----------------------------------------------------------------
commit 850864d81c49697b08254eebf565e8251f2e30db
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Aug 5 21:35:32 2016 +0200

    openssl-format-source: A few more (DECLARE|IMPLEMENT) variants to care for
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 util/openssl-format-source | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/openssl-format-source b/util/openssl-format-source
index 77645af..19f2b72 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -124,7 +124,7 @@ do
 	    perl -np \
 	      -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/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|STATIC_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF|PEM|OBJ|LHASH|DEPRECATED).*)$/\/**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**\//;' \
 	      -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
 	      -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \