diff options
author | Ben Laurie <ben@openssl.org> | 1999-04-17 21:25:43 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 1999-04-17 21:25:43 +0000 |
commit | e778802f53c8d47e96a6e4cbc776eb6e1d4c461a (patch) | |
tree | 719d4dd0fc69b355c6d8329af1f90b2c4f603548 /crypto/evp | |
parent | d77b3054cd87c2b13fa0169931f74b8e0dac5252 (diff) |
Massive constification.
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/bio_enc.c | 6 | ||||
-rw-r--r-- | crypto/evp/bio_md.c | 4 | ||||
-rw-r--r-- | crypto/evp/bio_ok.c | 4 | ||||
-rw-r--r-- | crypto/evp/digest.c | 4 | ||||
-rw-r--r-- | crypto/evp/e_cbc_r2.c | 4 | ||||
-rw-r--r-- | crypto/evp/evp.h | 37 | ||||
-rw-r--r-- | crypto/evp/evp_enc.c | 8 | ||||
-rw-r--r-- | crypto/evp/evp_key.c | 4 | ||||
-rw-r--r-- | crypto/evp/names.c | 18 |
9 files changed, 46 insertions, 43 deletions
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c index ad09b94b1a..e1443d684d 100644 --- a/crypto/evp/bio_enc.c +++ b/crypto/evp/bio_enc.c @@ -405,7 +405,7 @@ EVP_CIPHER_ctx *c; void BIO_set_cipher(b,c,k,i,e) BIO *b; -EVP_CIPHER *c; +const EVP_CIPHER *c; unsigned char *k; unsigned char *i; int e; @@ -415,7 +415,7 @@ int e; if (b == NULL) return; if ((b->callback != NULL) && - (b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,0L) <= 0)) + (b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,0L) <= 0)) return; b->init=1; @@ -423,6 +423,6 @@ int e; EVP_CipherInit(&(ctx->cipher),c,k,i,e); if (b->callback != NULL) - b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,1L); + b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,1L); } diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index fa5fdc055b..51dd1aa0c9 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -185,7 +185,7 @@ long num; char *ptr; { EVP_MD_CTX *ctx,*dctx,**pctx; - EVP_MD **ppmd; + const EVP_MD **ppmd; EVP_MD *md; long ret=1; BIO *dbio; @@ -204,7 +204,7 @@ char *ptr; case BIO_C_GET_MD: if (b->init) { - ppmd=(EVP_MD **)ptr; + ppmd=(const EVP_MD **)ptr; *ppmd=ctx->digest; } else diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c index 174ecdeb39..09ce86f3ce 100644 --- a/crypto/evp/bio_ok.c +++ b/crypto/evp/bio_ok.c @@ -371,7 +371,7 @@ char *ptr; { BIO_OK_CTX *ctx; EVP_MD *md; - EVP_MD **ppmd; + const EVP_MD **ppmd; long ret=1; int i; @@ -440,7 +440,7 @@ char *ptr; case BIO_C_GET_MD: if (b->init) { - ppmd=(EVP_MD **)ptr; + ppmd=(const EVP_MD **)ptr; *ppmd=ctx->md.digest; } else diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 7ef0e73b5a..e2604ac8ca 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -63,7 +63,7 @@ void EVP_DigestInit(ctx,type) EVP_MD_CTX *ctx; -EVP_MD *type; +const EVP_MD *type; { ctx->digest=type; type->init(&(ctx->md)); @@ -71,7 +71,7 @@ EVP_MD *type; void EVP_DigestUpdate(ctx,data,count) EVP_MD_CTX *ctx; -unsigned char *data; +const unsigned char *data; unsigned int count; { ctx->digest->update(&(ctx->md.base[0]),data,(unsigned long)count); diff --git a/crypto/evp/e_cbc_r2.c b/crypto/evp/e_cbc_r2.c index b15310ab48..57d46129b6 100644 --- a/crypto/evp/e_cbc_r2.c +++ b/crypto/evp/e_cbc_r2.c @@ -68,7 +68,7 @@ static void rc2_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv,int enc); static void rc2_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl); -static int rc2_meth_to_magic(EVP_CIPHER *e); +static int rc2_meth_to_magic(const EVP_CIPHER *e); static EVP_CIPHER *rc2_magic_to_meth(int i); static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type); static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type); @@ -168,7 +168,7 @@ unsigned int inl; } static int rc2_meth_to_magic(e) -EVP_CIPHER *e; +const EVP_CIPHER *e; { int i; diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 1188c35787..bc6ea0c033 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -285,7 +285,7 @@ typedef struct env_md_st typedef struct env_md_ctx_st { - EVP_MD *digest; + const EVP_MD *digest; union { unsigned char base[4]; #ifndef NO_MD2 @@ -324,13 +324,13 @@ typedef struct evp_cipher_st typedef struct evp_cipher_info_st { - EVP_CIPHER *cipher; + const EVP_CIPHER *cipher; unsigned char iv[EVP_MAX_IV_LENGTH]; } EVP_CIPHER_INFO; typedef struct evp_cipher_ctx_st { - EVP_CIPHER *cipher; + const EVP_CIPHER *cipher; int encrypt; /* encrypt or decrypt */ int buf_len; /* number we have left */ @@ -444,7 +444,11 @@ typedef int (EVP_PBE_KEYGEN)(unsigned char *pass, int passlen, #define EVP_OpenUpdate(a,b,c,d,e) EVP_DecryptUpdate(a,b,c,d,e) #define EVP_SealUpdate(a,b,c,d,e) EVP_EncryptUpdate(a,b,c,d,e) -#define BIO_set_md(b,md) BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md) +#ifdef CONST_STRICT +void BIO_set_md(BIO *,const EVP_MD *md); +#else +# define BIO_set_md(b,md) BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md) +#endif #define BIO_get_md(b,mdp) BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp) #define BIO_get_md_ctx(b,mdcp) BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp) #define BIO_get_cipher_status(b) BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL) @@ -464,34 +468,33 @@ typedef int (EVP_PBE_KEYGEN)(unsigned char *pass, int passlen, #ifndef NOPROTO int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in); -void EVP_DigestInit(EVP_MD_CTX *ctx, EVP_MD *type); -void EVP_DigestUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt); +void EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type); +void EVP_DigestUpdate(EVP_MD_CTX *ctx,const unsigned char *d, + unsigned int cnt); void EVP_DigestFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s); -int EVP_read_pw_string(char *buf,int length,char *prompt,int verify); +int EVP_read_pw_string(char *buf,int length,const char *prompt,int verify); void EVP_set_pw_prompt(char *prompt); char * EVP_get_pw_prompt(void); -int EVP_BytesToKey(EVP_CIPHER *type,EVP_MD *md,unsigned char *salt, +int EVP_BytesToKey(const EVP_CIPHER *type,EVP_MD *md,unsigned char *salt, unsigned char *data, int datal, int count, unsigned char *key,unsigned char *iv); -EVP_CIPHER *EVP_get_cipherbyname(char *name); - -void EVP_EncryptInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type, +void EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, unsigned char *key, unsigned char *iv); void EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, unsigned char *in, int inl); void EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); -void EVP_DecryptInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type, +void EVP_DecryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, unsigned char *key, unsigned char *iv); void EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, unsigned char *in, int inl); int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl); -void EVP_CipherInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type, unsigned char *key, - unsigned char *iv,int enc); +void EVP_CipherInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, + unsigned char *key,unsigned char *iv,int enc); void EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, unsigned char *in, int inl); int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl); @@ -534,7 +537,7 @@ BIO_METHOD *BIO_f_md(void); BIO_METHOD *BIO_f_base64(void); BIO_METHOD *BIO_f_cipher(void); BIO_METHOD *BIO_f_reliable(void); -void BIO_set_cipher(BIO *b,EVP_CIPHER *c,unsigned char *k, +void BIO_set_cipher(BIO *b,const EVP_CIPHER *c,unsigned char *k, unsigned char *i, int enc); #endif @@ -594,8 +597,8 @@ void SSLeay_add_all_digests(void); int EVP_add_cipher(EVP_CIPHER *cipher); int EVP_add_digest(EVP_MD *digest); -EVP_CIPHER *EVP_get_cipherbyname(char *name); -EVP_MD *EVP_get_digestbyname(char *name); +const EVP_CIPHER *EVP_get_cipherbyname(const char *name); +const EVP_MD *EVP_get_digestbyname(const char *name); void EVP_cleanup(void); int EVP_PKEY_decrypt(unsigned char *dec_key,unsigned char *enc_key, diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 46fb3c27db..2814e32455 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -60,7 +60,7 @@ #include "cryptlib.h" #include "evp.h" -char *EVP_version="EVP" OPENSSL_VERSION_PTEXT; +const char *EVP_version="EVP" OPENSSL_VERSION_PTEXT; void EVP_CIPHER_CTX_init(ctx) EVP_CIPHER_CTX *ctx; @@ -71,7 +71,7 @@ EVP_CIPHER_CTX *ctx; void EVP_CipherInit(ctx,data,key,iv,enc) EVP_CIPHER_CTX *ctx; -EVP_CIPHER *data; +const EVP_CIPHER *data; unsigned char *key; unsigned char *iv; int enc; @@ -109,7 +109,7 @@ int *outl; void EVP_EncryptInit(ctx,cipher,key,iv) EVP_CIPHER_CTX *ctx; -EVP_CIPHER *cipher; +const EVP_CIPHER *cipher; unsigned char *key; unsigned char *iv; { @@ -122,7 +122,7 @@ unsigned char *iv; void EVP_DecryptInit(ctx,cipher,key,iv) EVP_CIPHER_CTX *ctx; -EVP_CIPHER *cipher; +const EVP_CIPHER *cipher; unsigned char *key; unsigned char *iv; { diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c index dafa686f64..b766f73ec1 100644 --- a/crypto/evp/evp_key.c +++ b/crypto/evp/evp_key.c @@ -89,7 +89,7 @@ int des_read_pw_string(char *buf,int len,char *prompt,int verify); int EVP_read_pw_string(buf,len,prompt,verify) char *buf; int len; -char *prompt; +const char *prompt; int verify; { if ((prompt == NULL) && (prompt_string[0] != '\0')) @@ -98,7 +98,7 @@ int verify; } int EVP_BytesToKey(type,md,salt,data,datal,count,key,iv) -EVP_CIPHER *type; +const EVP_CIPHER *type; EVP_MD *md; unsigned char *salt; unsigned char *data; diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 6bf37100de..124ff8fcd3 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -77,7 +77,7 @@ int EVP_add_digest(md) EVP_MD *md; { int r; - char *name; + const char *name; name=OBJ_nid2sn(md->type); r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md); @@ -96,21 +96,21 @@ EVP_MD *md; return(r); } -EVP_CIPHER *EVP_get_cipherbyname(name) -char *name; +const EVP_CIPHER *EVP_get_cipherbyname(name) +const char *name; { - EVP_CIPHER *cp; + const EVP_CIPHER *cp; - cp=(EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH); + cp=(const EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH); return(cp); } -EVP_MD *EVP_get_digestbyname(name) -char *name; +const EVP_MD *EVP_get_digestbyname(name) +const char *name; { - EVP_MD *cp; + const EVP_MD *cp; - cp=(EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH); + cp=(const EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH); return(cp); } |