Commit 2ac6115d authored by Richard Levitte's avatar Richard Levitte
Browse files

Deal with the consequences of constifying getters 



Reviewed-by: default avatarStephen Henson <steve@openssl.org>
Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent fd809cfd

apps/apps.c

+1 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ void print_name(BIO *out, const char *title, X509_NAME *nm, 
    }

}



void print_bignum_var(BIO *out, BIGNUM *in, const char *var,

void print_bignum_var(BIO *out, const BIGNUM *in, const char *var,

                      int len, unsigned char *buffer)

{

    BIO_printf(out, "    static unsigned char %s_%d[] = {", var, len);

apps/apps.h

+2 −1
Original line number Diff line number Diff line
@@ -380,7 +380,8 @@ int dump_cert_text(BIO *out, X509 *x); 
void print_name(BIO *out, const char *title, X509_NAME *nm,

                unsigned long lflags);

# endif

void print_bignum_var(BIO *, BIGNUM *, const char*, int, unsigned char *);

void print_bignum_var(BIO *, const BIGNUM *, const char*,

                      int, unsigned char *);

void print_array(BIO *, const char *, int, const unsigned char *);

int set_cert_ex(unsigned long *flags, const char *arg);

int set_name_ex(unsigned long *flags, const char *arg);

apps/dhparam.c

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ int dhparam_main(int argc, char **argv) 
    if (C) {

        unsigned char *data;

        int len, bits;

        BIGNUM *pbn, *gbn;

        const BIGNUM *pbn, *gbn;



        len = DH_size(dh);

        bits = DH_bits(dh);
@@ -337,7 +337,7 @@ int dhparam_main(int argc, char **argv) 
    }



    if (!noout) {

        BIGNUM *q;

        const BIGNUM *q;

        DH_get0_pqg(dh, NULL, &q, NULL);

        if (outformat == FORMAT_ASN1)

            i = i2d_DHparams_bio(out, dh);

apps/dsa.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ int dsa_main(int argc, char **argv) 
    }



    if (modulus) {

        BIGNUM *pub_key = NULL;

        const BIGNUM *pub_key = NULL;

        DSA_get0_key(dsa, &pub_key, NULL);

        BIO_printf(out, "Public Key=");

        BN_print(out, pub_key);

apps/dsaparam.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int dsaparam_main(int argc, char **argv) 
    }



    if (C) {

        BIGNUM *p = NULL, *q = NULL, *g = NULL;

        const BIGNUM *p = NULL, *q = NULL, *g = NULL;

        unsigned char *data;

        int len, bits_p;