diff options
| author | tb <> | 2018-05-30 15:32:11 +0000 |
|---|---|---|
| committer | tb <> | 2018-05-30 15:32:11 +0000 |
| commit | 87588ca5f85a92585105f886faa049e39b3feb2c (patch) | |
| tree | 61b38ee6ada66e260c5010e819741dd1186d0f51 | |
| parent | ba417c1f27f6729e06c935d52544e49aa831b602 (diff) | |
| download | openbsd-87588ca5f85a92585105f886faa049e39b3feb2c.tar.gz openbsd-87588ca5f85a92585105f886faa049e39b3feb2c.tar.bz2 openbsd-87588ca5f85a92585105f886faa049e39b3feb2c.zip | |
Add a const qualifier to the `uni' argument of OPENSSL_uni2asc().
tested in a bulk build by sthen
ok jsing
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_utl.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs12/pkcs12.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c index eb95417d1b..ff3a035d3f 100644 --- a/src/lib/libcrypto/pkcs12/p12_utl.c +++ b/src/lib/libcrypto/pkcs12/p12_utl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_utl.c,v 1.15 2016/12/30 15:34:35 jsing Exp $ */ | 1 | /* $OpenBSD: p12_utl.c,v 1.16 2018/05/30 15:32:11 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 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -100,7 +100,7 @@ OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen) | |||
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | char * | 102 | char * |
| 103 | OPENSSL_uni2asc(unsigned char *uni, int unilen) | 103 | OPENSSL_uni2asc(const unsigned char *uni, int unilen) |
| 104 | { | 104 | { |
| 105 | size_t asclen, u16len, i; | 105 | size_t asclen, u16len, i; |
| 106 | char *asctmp; | 106 | char *asctmp; |
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h index 64a70f28e4..56635f9d7e 100644 --- a/src/lib/libcrypto/pkcs12/pkcs12.h +++ b/src/lib/libcrypto/pkcs12/pkcs12.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pkcs12.h,v 1.23 2018/05/13 14:28:14 tb Exp $ */ | 1 | /* $OpenBSD: pkcs12.h,v 1.24 2018/05/30 15:32:11 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 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -237,7 +237,7 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, | |||
| 237 | int saltlen, const EVP_MD *md_type); | 237 | int saltlen, const EVP_MD *md_type); |
| 238 | unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, | 238 | unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, |
| 239 | unsigned char **uni, int *unilen); | 239 | unsigned char **uni, int *unilen); |
| 240 | char *OPENSSL_uni2asc(unsigned char *uni, int unilen); | 240 | char *OPENSSL_uni2asc(const unsigned char *uni, int unilen); |
| 241 | 241 | ||
| 242 | PKCS12 *PKCS12_new(void); | 242 | PKCS12 *PKCS12_new(void); |
| 243 | void PKCS12_free(PKCS12 *a); | 243 | void PKCS12_free(PKCS12 *a); |
