diff options
| author | Ben Laurie <ben@openssl.org> | 1999-04-16 18:13:27 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-04-16 18:13:27 +0000 |
| commit | c5db363e1b75f8452e4c888402a8ecb291b13838 (patch) | |
| tree | b7c2b8078f77d9cfadc7d1343eea2bc08a8acdea /crypto | |
| parent | ddb25f88c22aba88da94602c383180042e29a81c (diff) | |
Fix some warnings. Contributed by Anonymous.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/asn_pack.c | 4 | ||||
| -rw-r--r-- | crypto/evp/e_cbc_r2.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_decr.c | 4 | ||||
| -rw-r--r-- | crypto/x509v3/v3_skey.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c index e04d327e41..6e0dd95622 100644 --- a/crypto/asn1/asn_pack.c +++ b/crypto/asn1/asn_pack.c @@ -114,7 +114,9 @@ char *ASN1_unpack_string (oct, d2i) ASN1_STRING *oct; char *(*d2i)(); { - unsigned char *p, *ret; + unsigned char *p; + char *ret; + p = oct->data; if(!(ret = d2i(NULL, &p, oct->length))) ASN1err(ASN1_F_ASN1_UNPACK_STRING,ASN1_R_DECODE_ERROR); diff --git a/crypto/evp/e_cbc_r2.c b/crypto/evp/e_cbc_r2.c index 9175e53550..b15310ab48 100644 --- a/crypto/evp/e_cbc_r2.c +++ b/crypto/evp/e_cbc_r2.c @@ -192,7 +192,7 @@ int i; } } -int rc2_get_asn1_type_and_iv(c,type) +static int rc2_get_asn1_type_and_iv(c,type) EVP_CIPHER_CTX *c; ASN1_TYPE *type; { diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index d28e886057..5dee184c7b 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -122,8 +122,10 @@ int passlen; ASN1_OCTET_STRING *oct; int seq; { - unsigned char *out, *p, *ret; + unsigned char *out, *p; + char *ret; int outlen; + if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length, &out, &outlen, 0)) { PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR); diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c index e725d6630c..932cd8b26c 100644 --- a/crypto/x509v3/v3_skey.c +++ b/crypto/x509v3/v3_skey.c @@ -115,7 +115,7 @@ char *str; } -ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str) +static ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str) X509V3_EXT_METHOD *method; X509V3_CTX *ctx; char *str; |