diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-03-02 13:26:29 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-02 13:50:01 +0000 |
| commit | 8a8ba0716796af963947586dca063ca95460010e (patch) | |
| tree | edc4edd89b088f55829524f75995caeab4466d92 /util | |
| parent | 1b4a8df38fc9ab3c089ca5765075ee53ec5bd66a (diff) | |
Fix format script.
The format script didn't correctly recognise some ASN.1 macros and
didn't reformat some files as a result. Fix script and reformat
affected files.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a)
Conflicts:
crypto/asn1/x_long.c
Diffstat (limited to 'util')
| -rwxr-xr-x | util/openssl-format-source | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/openssl-format-source b/util/openssl-format-source index 4e90147434..8c3a7c0dbb 100755 --- a/util/openssl-format-source +++ b/util/openssl-format-source @@ -119,7 +119,7 @@ do -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**\//;' \ -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \ - -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \ + -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \ -e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \ -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \ | \ |