diff options
author | tb <> | 2017-11-28 06:55:49 +0000 |
---|---|---|
committer | tb <> | 2017-11-28 06:55:49 +0000 |
commit | 2123407555a8a039a48a3bbe8fa9edbe43401803 (patch) | |
tree | 896abe9085168c02455508c6273605b4ac8a6e3c | |
parent | 39d54f53c5193a75023fc870449caf64192e3183 (diff) | |
download | openbsd-2123407555a8a039a48a3bbe8fa9edbe43401803.tar.gz openbsd-2123407555a8a039a48a3bbe8fa9edbe43401803.tar.bz2 openbsd-2123407555a8a039a48a3bbe8fa9edbe43401803.zip |
GNU ld has prefixed the contents of .gnu.warning.SYMBOL sections
with "warning: " since 2003, so the messages themselves need not
contain the prefix anymore.
From Scott Cheloha
ok jca, deraadt
-rw-r--r-- | src/lib/libc/stdlib/rand.c | 6 | ||||
-rw-r--r-- | src/lib/libc/stdlib/random.c | 4 | ||||
-rw-r--r-- | src/lib/libc/string/stpcpy.c | 4 | ||||
-rw-r--r-- | src/lib/libc/string/strcat.c | 4 | ||||
-rw-r--r-- | src/lib/libc/string/strcpy.c | 4 | ||||
-rw-r--r-- | src/lib/libc/string/wcscat.c | 4 | ||||
-rw-r--r-- | src/lib/libc/string/wcscpy.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp_enc.c | 8 |
8 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/libc/stdlib/rand.c b/src/lib/libc/stdlib/rand.c index f4a8d20afa..97964f6ef9 100644 --- a/src/lib/libc/stdlib/rand.c +++ b/src/lib/libc/stdlib/rand.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rand.c,v 1.17 2016/10/22 19:19:34 tb Exp $ */ | 1 | /* $OpenBSD: rand.c,v 1.18 2017/11/28 06:55:49 tb Exp $ */ |
2 | /*- | 2 | /*- |
3 | * Copyright (c) 1990 The Regents of the University of California. | 3 | * Copyright (c) 1990 The Regents of the University of California. |
4 | * All rights reserved. | 4 | * All rights reserved. |
@@ -44,7 +44,7 @@ DEF_WEAK(rand_r); | |||
44 | 44 | ||
45 | #if defined(APIWARN) | 45 | #if defined(APIWARN) |
46 | __warn_references(rand_r, | 46 | __warn_references(rand_r, |
47 | "warning: rand_r() is not random, it is deterministic."); | 47 | "rand_r() is not random, it is deterministic."); |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | int | 50 | int |
@@ -57,7 +57,7 @@ rand(void) | |||
57 | 57 | ||
58 | #if defined(APIWARN) | 58 | #if defined(APIWARN) |
59 | __warn_references(rand, | 59 | __warn_references(rand, |
60 | "warning: rand() may return deterministic values, is that what you want?"); | 60 | "rand() may return deterministic values, is that what you want?"); |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | void | 63 | void |
diff --git a/src/lib/libc/stdlib/random.c b/src/lib/libc/stdlib/random.c index 41d5f64b58..62a0c24bdb 100644 --- a/src/lib/libc/stdlib/random.c +++ b/src/lib/libc/stdlib/random.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: random.c,v 1.30 2016/04/05 04:29:21 guenther Exp $ */ | 1 | /* $OpenBSD: random.c,v 1.31 2017/11/28 06:55:49 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1983 Regents of the University of California. | 3 | * Copyright (c) 1983 Regents of the University of California. |
4 | * All rights reserved. | 4 | * All rights reserved. |
@@ -415,5 +415,5 @@ random(void) | |||
415 | 415 | ||
416 | #if defined(APIWARN) | 416 | #if defined(APIWARN) |
417 | __warn_references(random, | 417 | __warn_references(random, |
418 | "warning: random() may return deterministic values, is that what you want?"); | 418 | "random() may return deterministic values, is that what you want?"); |
419 | #endif | 419 | #endif |
diff --git a/src/lib/libc/string/stpcpy.c b/src/lib/libc/string/stpcpy.c index d88afac345..5a86541f08 100644 --- a/src/lib/libc/string/stpcpy.c +++ b/src/lib/libc/string/stpcpy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: stpcpy.c,v 1.2 2014/07/09 17:08:21 naddy Exp $ */ | 1 | /* $OpenBSD: stpcpy.c,v 1.3 2017/11/28 06:55:49 tb Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1988 Regents of the University of California. | 4 | * Copyright (c) 1988 Regents of the University of California. |
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #if defined(APIWARN) | 34 | #if defined(APIWARN) |
35 | __warn_references(stpcpy, | 35 | __warn_references(stpcpy, |
36 | "warning: stpcpy() is dangerous; do not use it"); | 36 | "stpcpy() is dangerous; do not use it"); |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | char * | 39 | char * |
diff --git a/src/lib/libc/string/strcat.c b/src/lib/libc/string/strcat.c index 646c9c2090..73da22f75d 100644 --- a/src/lib/libc/string/strcat.c +++ b/src/lib/libc/string/strcat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: strcat.c,v 1.9 2014/06/10 04:17:37 deraadt Exp $ */ | 1 | /* $OpenBSD: strcat.c,v 1.10 2017/11/28 06:55:49 tb Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1988 Regents of the University of California. | 4 | * Copyright (c) 1988 Regents of the University of California. |
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #if defined(APIWARN) | 34 | #if defined(APIWARN) |
35 | __warn_references(strcat, | 35 | __warn_references(strcat, |
36 | "warning: strcat() is almost always misused, please use strlcat()"); | 36 | "strcat() is almost always misused, please use strlcat()"); |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | char * | 39 | char * |
diff --git a/src/lib/libc/string/strcpy.c b/src/lib/libc/string/strcpy.c index 5a9001e431..290eefeabf 100644 --- a/src/lib/libc/string/strcpy.c +++ b/src/lib/libc/string/strcpy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: strcpy.c,v 1.9 2014/06/10 04:17:37 deraadt Exp $ */ | 1 | /* $OpenBSD: strcpy.c,v 1.10 2017/11/28 06:55:49 tb Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1988 Regents of the University of California. | 4 | * Copyright (c) 1988 Regents of the University of California. |
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #if defined(APIWARN) | 34 | #if defined(APIWARN) |
35 | __warn_references(strcpy, | 35 | __warn_references(strcpy, |
36 | "warning: strcpy() is almost always misused, please use strlcpy()"); | 36 | "strcpy() is almost always misused, please use strlcpy()"); |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | char * | 39 | char * |
diff --git a/src/lib/libc/string/wcscat.c b/src/lib/libc/string/wcscat.c index 5ddb510fad..0525c3cb14 100644 --- a/src/lib/libc/string/wcscat.c +++ b/src/lib/libc/string/wcscat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcscat.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ | 1 | /* $OpenBSD: wcscat.c,v 1.5 2017/11/28 06:55:49 tb Exp $ */ |
2 | /* $NetBSD: wcscat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ | 2 | /* $NetBSD: wcscat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #if defined(APIWARN) | 34 | #if defined(APIWARN) |
35 | __warn_references(wcscat, | 35 | __warn_references(wcscat, |
36 | "warning: wcscat() is almost always misused, please use wcslcat()"); | 36 | "wcscat() is almost always misused, please use wcslcat()"); |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | wchar_t * | 39 | wchar_t * |
diff --git a/src/lib/libc/string/wcscpy.c b/src/lib/libc/string/wcscpy.c index 75fdb75fe4..f772752413 100644 --- a/src/lib/libc/string/wcscpy.c +++ b/src/lib/libc/string/wcscpy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcscpy.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcscpy.c,v 1.5 2017/11/28 06:55:49 tb Exp $ */ |
2 | /* $NetBSD: wcscpy.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ | 2 | /* $NetBSD: wcscpy.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #if defined(APIWARN) | 34 | #if defined(APIWARN) |
35 | __warn_references(wcscpy, | 35 | __warn_references(wcscpy, |
36 | "warning: wcscpy() is almost always misused, please use wcslcpy()"); | 36 | "wcscpy() is almost always misused, please use wcslcpy()"); |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | wchar_t * | 39 | wchar_t * |
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c index d0a5eb2d5f..1b1e9da901 100644 --- a/src/lib/libcrypto/evp/evp_enc.c +++ b/src/lib/libcrypto/evp/evp_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_enc.c,v 1.36 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: evp_enc.c,v 1.37 2017/11/28 06:55:49 tb 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 | * |
@@ -258,7 +258,7 @@ EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) | |||
258 | } | 258 | } |
259 | 259 | ||
260 | __warn_references(EVP_CipherFinal, | 260 | __warn_references(EVP_CipherFinal, |
261 | "warning: EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup"); | 261 | "EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup"); |
262 | 262 | ||
263 | int | 263 | int |
264 | EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) | 264 | EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) |
@@ -368,7 +368,7 @@ EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, | |||
368 | } | 368 | } |
369 | 369 | ||
370 | __warn_references(EVP_EncryptFinal, | 370 | __warn_references(EVP_EncryptFinal, |
371 | "warning: EVP_EncryptFinal is often misused, please use EVP_EncryptFinal_ex and EVP_CIPHER_CTX_cleanup"); | 371 | "EVP_EncryptFinal is often misused, please use EVP_EncryptFinal_ex and EVP_CIPHER_CTX_cleanup"); |
372 | 372 | ||
373 | int | 373 | int |
374 | EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) | 374 | EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) |
@@ -483,7 +483,7 @@ EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, | |||
483 | } | 483 | } |
484 | 484 | ||
485 | __warn_references(EVP_DecryptFinal, | 485 | __warn_references(EVP_DecryptFinal, |
486 | "warning: EVP_DecryptFinal is often misused, please use EVP_DecryptFinal_ex and EVP_CIPHER_CTX_cleanup"); | 486 | "EVP_DecryptFinal is often misused, please use EVP_DecryptFinal_ex and EVP_CIPHER_CTX_cleanup"); |
487 | 487 | ||
488 | int | 488 | int |
489 | EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) | 489 | EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) |