diff options
| author |   tb <tb@openbsd.org> | 2018-05-30 15:32:11 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-05-30 15:32:11 +0000 |
| commit | 27e8856ff03a5a3679ac4774e0c7c89a34f673db (patch) | |
| tree | 2d5d28f8bf114be5d7db9bd2026eb00a445b4d07 /lib/libcrypto | |
| parent | calling err after fgets assumes we're not at EOF. (diff) | |
| download | wireguard-openbsd-27e8856ff03a5a3679ac4774e0c7c89a34f673db.tar.xz wireguard-openbsd-27e8856ff03a5a3679ac4774e0c7c89a34f673db.zip | |
Add a const qualifier to the `uni' argument of OPENSSL_uni2asc().
tested in a bulk build by sthen
ok jsing
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/pkcs12/p12_utl.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/pkcs12/pkcs12.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/pkcs12/p12_utl.c b/lib/libcrypto/pkcs12/p12_utl.c index eb95417d1b1..ff3a035d3f7 100644 --- a/lib/libcrypto/pkcs12/p12_utl.c +++ b/lib/libcrypto/pkcs12/p12_utl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_utl.c,v 1.15 2016/12/30 15:34:35 jsing Exp $ */ +/* $OpenBSD: p12_utl.c,v 1.16 2018/05/30 15:32:11 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -100,7 +100,7 @@ OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen) } char * -OPENSSL_uni2asc(unsigned char *uni, int unilen) +OPENSSL_uni2asc(const unsigned char *uni, int unilen) { size_t asclen, u16len, i; char *asctmp; diff --git a/lib/libcrypto/pkcs12/pkcs12.h b/lib/libcrypto/pkcs12/pkcs12.h index 64a70f28e4c..56635f9d7e0 100644 --- a/lib/libcrypto/pkcs12/pkcs12.h +++ b/lib/libcrypto/pkcs12/pkcs12.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs12.h,v 1.23 2018/05/13 14:28:14 tb Exp $ */ +/* $OpenBSD: pkcs12.h,v 1.24 2018/05/30 15:32:11 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -237,7 +237,7 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, const EVP_MD *md_type); unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen); -char *OPENSSL_uni2asc(unsigned char *uni, int unilen); +char *OPENSSL_uni2asc(const unsigned char *uni, int unilen); PKCS12 *PKCS12_new(void); void PKCS12_free(PKCS12 *a); |