Commit c565e99a authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Fix undefined behaviour when printing the X509 and CRL version 



Found by oss-fuzz

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
GH: #2231
(cherry picked from commit c2ce477f)
parent 39ff4d7a

crypto/x509/t_crl.c

+4 −1
Original line number Diff line number Diff line
@@ -44,7 +44,10 @@ int X509_CRL_print(BIO *out, X509_CRL *x) 


    BIO_printf(out, "Certificate Revocation List (CRL):\n");

    l = X509_CRL_get_version(x);

    BIO_printf(out, "%8sVersion %lu (0x%lx)\n", "", l + 1, l);

    if (l >= 0 && l <= 1)

        BIO_printf(out, "%8sVersion %ld (0x%lx)\n", "", l + 1, (unsigned long)l);

    else

        BIO_printf(out, "%8sVersion unknown (%ld)\n", "", l);

    X509_CRL_get0_signature(x, &sig, &sig_alg);

    X509_signature_print(out, sig_alg, NULL);

    p = X509_NAME_oneline(X509_CRL_get_issuer(x), NULL, 0);

crypto/x509/t_req.c

+7 −2
Original line number Diff line number Diff line
@@ -60,8 +60,13 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, 
    }

    if (!(cflag & X509_FLAG_NO_VERSION)) {

        l = X509_REQ_get_version(x);

        if (BIO_printf(bp, "%8sVersion: %ld (0x%lx)\n", "", l + 1, l) <= 0)

        if (l >= 0 && l <= 2) {

            if (BIO_printf(bp, "%8sVersion: %ld (0x%lx)\n", "", l + 1, (unsigned long)l) <= 0)

                goto err;

        } else {

            if (BIO_printf(bp, "%8sVersion: Unknown (%ld)\n", "", l) <= 0)

                goto err;

        }

    }

    if (!(cflag & X509_FLAG_NO_SUBJECT)) {

        if (BIO_printf(bp, "        Subject:%c", mlch) <= 0)