Commit 5e6089f0 authored by Matt Caswell's avatar Matt Caswell Committed by Dr. Stephen Henson
Browse files

Convert X509_CRL* functions to use const getters

parent 6eabcc83
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -250,9 +250,9 @@ int crl_main(int argc, char **argv)
    }

    if (badsig) {
        ASN1_BIT_STRING *sig;
        const ASN1_BIT_STRING *sig;

        X509_CRL_get0_signature(&sig, NULL, x);
        X509_CRL_get0_signature(x, &sig, NULL);
        corrupt_signature(sig);
    }

+3 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ int X509_CRL_print(BIO *out, X509_CRL *x)
{
    STACK_OF(X509_REVOKED) *rev;
    X509_REVOKED *r;
    X509_ALGOR *sig_alg;
    ASN1_BIT_STRING *sig;
    const X509_ALGOR *sig_alg;
    const ASN1_BIT_STRING *sig;
    long l;
    int i;
    char *p;
@@ -45,7 +45,7 @@ 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);
    X509_CRL_get0_signature(&sig, &sig_alg, x);
    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);
    BIO_printf(out, "%8sIssuer: %s\n", "", p);
+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
    return 1;
}

int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
int X509_signature_print(BIO *bp, const X509_ALGOR *sigalg,
                         const ASN1_STRING *sig)
{
    int sig_nid;
    if (BIO_puts(bp, "    Signature Algorithm: ") <= 0)
+3 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ X509_NAME *X509_CRL_get_issuer(const X509_CRL *crl)
    return crl->crl.issuer;
}

STACK_OF(X509_EXTENSION) *X509_CRL_get0_extensions(X509_CRL *crl)
const STACK_OF(X509_EXTENSION) *X509_CRL_get0_extensions(const X509_CRL *crl)
{
    return crl->crl.extensions;
}
@@ -125,8 +125,8 @@ STACK_OF(X509_REVOKED) *X509_CRL_get_REVOKED(X509_CRL *crl)
    return crl->crl.revoked;
}

void X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
                             X509_CRL *crl)
void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
                             const X509_ALGOR **palg)
{
    if (psig != NULL)
        *psig = &crl->signature;
+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
    return ok;
}

int X509V3_extensions_print(BIO *bp, char *title,
                            STACK_OF(X509_EXTENSION) *exts,
int X509V3_extensions_print(BIO *bp, const char *title,
                            const STACK_OF(X509_EXTENSION) *exts,
                            unsigned long flag, int indent)
{
    int i, j;
Loading