Have mkerr.pl treat already existing multiline string defs properly
authorRichard Levitte <levitte@openssl.org>
Wed, 8 Apr 2015 17:26:11 +0000 (19:26 +0200)
committerRichard Levitte <levitte@openssl.org>
Wed, 8 Apr 2015 19:56:03 +0000 (21:56 +0200)
commit32fbe9149e01dc79d97efe13aff2054f77045afb
tree5f482bb746390796e6e09dda87d565d67385e2ac
parent246b35a96e6402583825fcee6a4ce5305e26ec76
Have mkerr.pl treat already existing multiline string defs properly

Since source reformat, we ended up with some error reason string
definitions that spanned two lines.  That in itself is fine, but we
sometimes edited them to provide better strings than what could be
automatically determined from the reason macro, for example:

    {ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
     "Peer haven't sent GOST certificate, required for selected ciphersuite"},

However, mkerr.pl didn't treat those two-line definitions right, and
they ended up being retranslated to whatever the macro name would
indicate, for example:

    {ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
     "No gost certificate sent by peer"},

Clearly not what we wanted.  This change fixes this problem.

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 2cfdfe0918f03f8323c9523a2beb2b363ae86ca7)

Conflicts:
util/mkerr.pl
util/mkerr.pl