diff options
| author | tb <> | 2018-05-01 19:01:28 +0000 |
|---|---|---|
| committer | tb <> | 2018-05-01 19:01:28 +0000 |
| commit | 7c375c1a832336c8d9c706ebe1c9cd62252a1d88 (patch) | |
| tree | e9d6db4dc429199f91cfda5cd0905819d2440282 /src/lib/libcrypto/ec/ec_ameth.c | |
| parent | d43036dd09aeeef2500a4108c43e0d756c57038e (diff) | |
| download | openbsd-7c375c1a832336c8d9c706ebe1c9cd62252a1d88.tar.gz openbsd-7c375c1a832336c8d9c706ebe1c9cd62252a1d88.tar.bz2 openbsd-7c375c1a832336c8d9c706ebe1c9cd62252a1d88.zip | |
Convert a handful of X509_*() functions to take const as in OpenSSL.
tested in a bulk by sthen
ok jsing
Diffstat (limited to 'src/lib/libcrypto/ec/ec_ameth.c')
| -rw-r--r-- | src/lib/libcrypto/ec/ec_ameth.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c index 0932f1e3c9..3d52b90383 100644 --- a/src/lib/libcrypto/ec/ec_ameth.c +++ b/src/lib/libcrypto/ec/ec_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ec_ameth.c,v 1.19 2018/03/12 13:14:21 inoguchi Exp $ */ | 1 | /* $OpenBSD: ec_ameth.c,v 1.20 2018/05/01 19:01:28 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -136,12 +136,12 @@ err: | |||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | static EC_KEY * | 138 | static EC_KEY * |
| 139 | eckey_type2param(int ptype, void *pval) | 139 | eckey_type2param(int ptype, const void *pval) |
| 140 | { | 140 | { |
| 141 | EC_KEY *eckey = NULL; | 141 | EC_KEY *eckey = NULL; |
| 142 | 142 | ||
| 143 | if (ptype == V_ASN1_SEQUENCE) { | 143 | if (ptype == V_ASN1_SEQUENCE) { |
| 144 | ASN1_STRING *pstr = pval; | 144 | const ASN1_STRING *pstr = pval; |
| 145 | const unsigned char *pm = NULL; | 145 | const unsigned char *pm = NULL; |
| 146 | int pmlen; | 146 | int pmlen; |
| 147 | 147 | ||
| @@ -152,7 +152,7 @@ eckey_type2param(int ptype, void *pval) | |||
| 152 | goto ecerr; | 152 | goto ecerr; |
| 153 | } | 153 | } |
| 154 | } else if (ptype == V_ASN1_OBJECT) { | 154 | } else if (ptype == V_ASN1_OBJECT) { |
| 155 | ASN1_OBJECT *poid = pval; | 155 | const ASN1_OBJECT *poid = pval; |
| 156 | EC_GROUP *group; | 156 | EC_GROUP *group; |
| 157 | 157 | ||
| 158 | /* | 158 | /* |
| @@ -187,7 +187,7 @@ static int | |||
| 187 | eckey_pub_decode(EVP_PKEY * pkey, X509_PUBKEY * pubkey) | 187 | eckey_pub_decode(EVP_PKEY * pkey, X509_PUBKEY * pubkey) |
| 188 | { | 188 | { |
| 189 | const unsigned char *p = NULL; | 189 | const unsigned char *p = NULL; |
| 190 | void *pval; | 190 | const void *pval; |
| 191 | int ptype, pklen; | 191 | int ptype, pklen; |
| 192 | EC_KEY *eckey = NULL; | 192 | EC_KEY *eckey = NULL; |
| 193 | X509_ALGOR *palg; | 193 | X509_ALGOR *palg; |
| @@ -235,7 +235,7 @@ static int | |||
| 235 | eckey_priv_decode(EVP_PKEY * pkey, PKCS8_PRIV_KEY_INFO * p8) | 235 | eckey_priv_decode(EVP_PKEY * pkey, PKCS8_PRIV_KEY_INFO * p8) |
| 236 | { | 236 | { |
| 237 | const unsigned char *p = NULL; | 237 | const unsigned char *p = NULL; |
| 238 | void *pval; | 238 | const void *pval; |
| 239 | int ptype, pklen; | 239 | int ptype, pklen; |
| 240 | EC_KEY *eckey = NULL; | 240 | EC_KEY *eckey = NULL; |
| 241 | X509_ALGOR *palg; | 241 | X509_ALGOR *palg; |
