diff options
| author | bcook <> | 2014-08-24 16:11:39 +0000 |
|---|---|---|
| committer | bcook <> | 2014-08-24 16:11:39 +0000 |
| commit | 7578aa547ab7082a9bb1785cf26323e92b898f79 (patch) | |
| tree | 08c62b8f9d8d4660c67ab715ab4a1806fdccc1db | |
| parent | 192855a39ecdd30f74a9bd2376cc9c469e136cd0 (diff) | |
| download | openbsd-7578aa547ab7082a9bb1785cf26323e92b898f79.tar.gz openbsd-7578aa547ab7082a9bb1785cf26323e92b898f79.tar.bz2 openbsd-7578aa547ab7082a9bb1785cf26323e92b898f79.zip | |
constify strerror return value
There is no intention to modify the string returned by strerror and
doing so is forbidden by the standard.
from Jonas 'Sortie' Termansen
ok tedu@ deraadt@
| -rw-r--r-- | src/lib/libcrypto/err/err.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/err/err.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 571bfaed16..0802249da4 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err.c,v 1.38 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: err.c,v 1.39 2014/08/24 16:11:39 bcook Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -596,7 +596,7 @@ build_SYS_str_reasons(void) | |||
| 596 | if (str->string == NULL) { | 596 | if (str->string == NULL) { |
| 597 | char (*dest)[LEN_SYS_STR_REASON] = | 597 | char (*dest)[LEN_SYS_STR_REASON] = |
| 598 | &(strerror_tab[i - 1]); | 598 | &(strerror_tab[i - 1]); |
| 599 | char *src = strerror(i); | 599 | const char *src = strerror(i); |
| 600 | if (src != NULL) { | 600 | if (src != NULL) { |
| 601 | strlcpy(*dest, src, sizeof *dest); | 601 | strlcpy(*dest, src, sizeof *dest); |
| 602 | str->string = *dest; | 602 | str->string = *dest; |
diff --git a/src/lib/libssl/src/crypto/err/err.c b/src/lib/libssl/src/crypto/err/err.c index 571bfaed16..0802249da4 100644 --- a/src/lib/libssl/src/crypto/err/err.c +++ b/src/lib/libssl/src/crypto/err/err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err.c,v 1.38 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: err.c,v 1.39 2014/08/24 16:11:39 bcook Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -596,7 +596,7 @@ build_SYS_str_reasons(void) | |||
| 596 | if (str->string == NULL) { | 596 | if (str->string == NULL) { |
| 597 | char (*dest)[LEN_SYS_STR_REASON] = | 597 | char (*dest)[LEN_SYS_STR_REASON] = |
| 598 | &(strerror_tab[i - 1]); | 598 | &(strerror_tab[i - 1]); |
| 599 | char *src = strerror(i); | 599 | const char *src = strerror(i); |
| 600 | if (src != NULL) { | 600 | if (src != NULL) { |
| 601 | strlcpy(*dest, src, sizeof *dest); | 601 | strlcpy(*dest, src, sizeof *dest); |
| 602 | str->string = *dest; | 602 | str->string = *dest; |
