[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8e4ec5b2e7c9a5d12c348b2a3430c4b51ab041c5 (commit)
       via  be63fc1223579e7eb4ff747bfbd4b4fd3b0b01ea (commit)
       via  d1453d60a58b3e5de24a71d6fa65938629c144c8 (commit)
       via  e6cccb5f0523f5a61f5d963ca1708d02e3e83ccc (commit)
      from  4ff71d6740adde74acfa7d017fc2257be831caf3 (commit)


- Log -----------------------------------------------------------------
commit 8e4ec5b2e7c9a5d12c348b2a3430c4b51ab041c5
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 16 01:12:11 2017 +0100

    Modify expected output of a CRL to match the changed printout
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4746)

commit be63fc1223579e7eb4ff747bfbd4b4fd3b0b01ea
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 16 01:10:44 2017 +0100

    Add padding spaces before printing signature algorithm for CRLs output
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4746)

commit d1453d60a58b3e5de24a71d6fa65938629c144c8
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 16 01:09:50 2017 +0100

    Modify expected output of a certificate to match the changed printout
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4746)

commit e6cccb5f0523f5a61f5d963ca1708d02e3e83ccc
Author: Yutian Li <hotpxless at gmail.com>
Date:   Tue Aug 30 11:17:28 2016 +0800

    Add padding spaces before printing algo.
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Rich Salz <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1513)

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

Summary of changes:
 crypto/x509/t_crl.c          | 1 +
 crypto/x509/t_x509.c         | 3 +++
 test/certs/cyrillic.msb      | 2 +-
 test/certs/cyrillic.utf8     | 2 +-
 test/certs/cyrillic_crl.utf8 | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/crypto/x509/t_crl.c b/crypto/x509/t_crl.c
index e675669..8e26291 100644
--- a/crypto/x509/t_crl.c
+++ b/crypto/x509/t_crl.c
@@ -53,6 +53,7 @@ int X509_CRL_print_ex(BIO *out, X509_CRL *x, unsigned long nmflag)
     else
         BIO_printf(out, "%8sVersion unknown (%ld)\n", "", l);
     X509_CRL_get0_signature(x, &sig, &sig_alg);
+    BIO_puts(out, "    ");
     X509_signature_print(out, sig_alg, NULL);
     BIO_printf(out, "%8sIssuer: ", "");
     X509_NAME_print_ex(out, X509_CRL_get_issuer(x), 0, nmflag);
diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
index ba6f919..2ad7e63 100644
--- a/crypto/x509/t_x509.c
+++ b/crypto/x509/t_x509.c
@@ -119,6 +119,9 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags,
 
     if (!(cflag & X509_FLAG_NO_SIGNAME)) {
         const X509_ALGOR *tsig_alg = X509_get0_tbs_sigalg(x);
+
+        if (BIO_puts(bp, "    ") <= 0)
+            goto err;
         if (X509_signature_print(bp, tsig_alg, NULL) <= 0)
             goto err;
     }
diff --git a/test/certs/cyrillic.msb b/test/certs/cyrillic.msb
index 87f76cb..ec58ac9 100644
--- a/test/certs/cyrillic.msb
+++ b/test/certs/cyrillic.msb
@@ -3,7 +3,7 @@ Certificate:
         Version: 3 (0x2)
         Serial Number:
             be:47:3c:53:a6:2a:c0:3a
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=RU, ST=\U041C\U043E\U0441\U043A\U0432\U0430, L=\U041C\U043E\U0441\U043A\U0432\U0430, O=\U0414\U043C\U0438\U0442\U0440\U0438\U0439 \U0411\U0435\U043B\U044F\U0432\U0441\U043A\U0438\U0439, OU=\U042F, CN=Dmitry Belyavskiy, emailAddress=beldmit at example.com
         Validity
             Not Before: Feb 21 19:35:22 2017 GMT
diff --git a/test/certs/cyrillic.utf8 b/test/certs/cyrillic.utf8
index 6eda733..2096e4f 100644
--- a/test/certs/cyrillic.utf8
+++ b/test/certs/cyrillic.utf8
@@ -3,7 +3,7 @@ Certificate:
         Version: 3 (0x2)
         Serial Number:
             be:47:3c:53:a6:2a:c0:3a
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=RU, ST=Москва, L=Москва, O=Дмитрий Белявский, OU=Я, CN=Dmitry Belyavskiy, emailAddress=beldmit at example.com
         Validity
             Not Before: Feb 21 19:35:22 2017 GMT
diff --git a/test/certs/cyrillic_crl.utf8 b/test/certs/cyrillic_crl.utf8
index 07dcf75..e55c549 100644
--- a/test/certs/cyrillic_crl.utf8
+++ b/test/certs/cyrillic_crl.utf8
@@ -1,6 +1,6 @@
 Certificate Revocation List (CRL):
         Version 2 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=RU, ST=Москва, O=Я, OU=Я, CN=Дмитрий Белявский, emailAddress=beldmit at example.com
         Last Update: Apr 24 13:25:31 2017 GMT
         Next Update: May 24 13:25:31 2017 GMT