[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ca1cb0d4346bfefe00ec5d240e99b95c8ab743af (commit)
      from  a6f5d614c53aaa58595af4998228e82404132739 (commit)


- Log -----------------------------------------------------------------
commit ca1cb0d4346bfefe00ec5d240e99b95c8ab743af
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Fri Aug 5 09:33:30 2016 +0200

    Fix irregularities in GENERAL_NAME_print().
    
    Add colon when printing Registered ID.
    Remove extra space when printing DirName.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1401)

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

Summary of changes:
 crypto/x509v3/v3_alt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index 34b950e..0364e33 100644
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -158,7 +158,7 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
         break;
 
     case GEN_DIRNAME:
-        BIO_printf(out, "DirName: ");
+        BIO_printf(out, "DirName:");
         X509_NAME_print_ex(out, gen->d.dirn, 0, XN_FLAG_ONELINE);
         break;
 
@@ -180,7 +180,7 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
         break;
 
     case GEN_RID:
-        BIO_printf(out, "Registered ID");
+        BIO_printf(out, "Registered ID:");
         i2a_ASN1_OBJECT(out, gen->d.rid);
         break;
     }