Commit f0f0abe7 authored by Jack Bates's avatar Jack Bates Committed by Matt Caswell
Browse files

Convert _meth_get_ functions to const getters 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>

(cherry picked from commit 693be9a2)

(Merged from https://github.com/openssl/openssl/pull/5750)
parent 1eeb882e

crypto/bio/bio_meth.c

+8 −8
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void BIO_meth_free(BIO_METHOD *biom) 
    }

}



int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int)

int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int)

{

    return biom->bwrite;

}
@@ -67,7 +67,7 @@ int BIO_meth_set_write(BIO_METHOD *biom, 
    return 1;

}



int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int)

int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int)

{

    return biom->bread;

}
@@ -79,7 +79,7 @@ int BIO_meth_set_read(BIO_METHOD *biom, 
    return 1;

}



int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *)

int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *)

{

    return biom->bputs;

}
@@ -91,7 +91,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, 
    return 1;

}



int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int)

int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int)

{

    return biom->bgets;

}
@@ -103,7 +103,7 @@ int BIO_meth_set_gets(BIO_METHOD *biom, 
    return 1;

}



long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *)

long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *)

{

    return biom->ctrl;

}
@@ -115,7 +115,7 @@ int BIO_meth_set_ctrl(BIO_METHOD *biom, 
    return 1;

}



int (*BIO_meth_get_create(BIO_METHOD *biom)) (BIO *)

int (*BIO_meth_get_create(const BIO_METHOD *biom)) (BIO *)

{

    return biom->create;

}
@@ -126,7 +126,7 @@ int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)) 
    return 1;

}



int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *)

int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *)

{

    return biom->destroy;

}
@@ -137,7 +137,7 @@ int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)) 
    return 1;

}



long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *)

long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *)

{

    return biom->callback_ctrl;

}

crypto/dh/dh_meth.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int DH_meth_set1_name(DH_METHOD *dhm, const char *name) 
    return 1;

}



int DH_meth_get_flags(DH_METHOD *dhm)

int DH_meth_get_flags(const DH_METHOD *dhm)

{

    return dhm->flags;

}

crypto/dsa/dsa_meth.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name) 
    return 1;

}



int DSA_meth_get_flags(DSA_METHOD *dsam)

int DSA_meth_get_flags(const DSA_METHOD *dsam)

{

    return dsam->flags;

}

crypto/evp/pmeth_lib.c

+14 −14
Original line number Diff line number Diff line
@@ -565,26 +565,26 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, 
    pmeth->ctrl_str = ctrl_str;

}



void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth,

                            int (**pinit) (EVP_PKEY_CTX *ctx))

{

    *pinit = pmeth->init;

}



void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth,

                            int (**pcopy) (EVP_PKEY_CTX *dst,

                                           EVP_PKEY_CTX *src))

{

    *pcopy = pmeth->copy;

}



void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth,

                               void (**pcleanup) (EVP_PKEY_CTX *ctx))

{

    *pcleanup = pmeth->cleanup;

}



void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth,

                                int (**pparamgen_init) (EVP_PKEY_CTX *ctx),

                                int (**pparamgen) (EVP_PKEY_CTX *ctx,

                                                   EVP_PKEY *pkey))
@@ -595,7 +595,7 @@ void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth, 
        *pparamgen = pmeth->paramgen;

}



void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth,

                              int (**pkeygen_init) (EVP_PKEY_CTX *ctx),

                              int (**pkeygen) (EVP_PKEY_CTX *ctx,

                                               EVP_PKEY *pkey))
@@ -606,7 +606,7 @@ void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth, 
        *pkeygen = pmeth->keygen;

}



void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth,

                            int (**psign_init) (EVP_PKEY_CTX *ctx),

                            int (**psign) (EVP_PKEY_CTX *ctx,

                                           unsigned char *sig, size_t *siglen,
@@ -619,7 +619,7 @@ void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, 
        *psign = pmeth->sign;

}



void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth,

                              int (**pverify_init) (EVP_PKEY_CTX *ctx),

                              int (**pverify) (EVP_PKEY_CTX *ctx,

                                               const unsigned char *sig,
@@ -633,7 +633,7 @@ void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth, 
        *pverify = pmeth->verify;

}



void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth,

                                      int (**pverify_recover_init) (EVP_PKEY_CTX

                                                                    *ctx),

                                      int (**pverify_recover) (EVP_PKEY_CTX
@@ -651,7 +651,7 @@ void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth, 
        *pverify_recover = pmeth->verify_recover;

}



void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth,

                               int (**psignctx_init) (EVP_PKEY_CTX *ctx,

                                                      EVP_MD_CTX *mctx),

                               int (**psignctx) (EVP_PKEY_CTX *ctx,
@@ -665,7 +665,7 @@ void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth, 
        *psignctx = pmeth->signctx;

}



void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth,

                                 int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,

                                                          EVP_MD_CTX *mctx),

                                 int (**pverifyctx) (EVP_PKEY_CTX *ctx,
@@ -679,7 +679,7 @@ void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth, 
        *pverifyctx = pmeth->verifyctx;

}



void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth,

                               int (**pencrypt_init) (EVP_PKEY_CTX *ctx),

                               int (**pencryptfn) (EVP_PKEY_CTX *ctx,

                                                   unsigned char *out,
@@ -693,7 +693,7 @@ void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth, 
        *pencryptfn = pmeth->encrypt;

}



void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth,

                               int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),

                               int (**pdecrypt) (EVP_PKEY_CTX *ctx,

                                                 unsigned char *out,
@@ -707,7 +707,7 @@ void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, 
        *pdecrypt = pmeth->decrypt;

}



void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth,

                              int (**pderive_init) (EVP_PKEY_CTX *ctx),

                              int (**pderive) (EVP_PKEY_CTX *ctx,

                                               unsigned char *key,
@@ -719,7 +719,7 @@ void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth, 
        *pderive = pmeth->derive;

}



void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth,

void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth,

                            int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,

                                           void *p2),

                            int (**pctrl_str) (EVP_PKEY_CTX *ctx,

crypto/rsa/rsa_meth.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int RSA_meth_set1_name(RSA_METHOD *meth, const char *name) 
    return 1;

}



int RSA_meth_get_flags(RSA_METHOD *meth)

int RSA_meth_get_flags(const RSA_METHOD *meth)

{

    return meth->flags;

}