summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2015-07-18 22:46:42 +0000
committerbeck <>2015-07-18 22:46:42 +0000
commit789262561876b2fff0d8151c2e3e70736009ff97 (patch)
treebb12daf359b2f1e867530a628617573441542b08
parent47ef019d2dada0f1d7528d873b6f626f8a946501 (diff)
downloadopenbsd-789262561876b2fff0d8151c2e3e70736009ff97.tar.gz
openbsd-789262561876b2fff0d8151c2e3e70736009ff97.tar.bz2
openbsd-789262561876b2fff0d8151c2e3e70736009ff97.zip
rand_err doesn't exist anymore, coverity 78808
ok doug@
-rw-r--r--src/lib/libcrypto/rand/randfile.c6
-rw-r--r--src/lib/libssl/src/crypto/rand/randfile.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index e54a009420..6948a83634 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: randfile.c,v 1.40 2014/10/22 13:02:04 jsing Exp $ */ 1/* $OpenBSD: randfile.c,v 1.41 2015/07/18 22:46:42 beck 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 *
@@ -90,7 +90,7 @@ int
90RAND_write_file(const char *file) 90RAND_write_file(const char *file)
91{ 91{
92 unsigned char buf[BUFSIZE]; 92 unsigned char buf[BUFSIZE];
93 int i, ret = 0, rand_err = 0; 93 int i, ret = 0;
94 FILE *out = NULL; 94 FILE *out = NULL;
95 int n, fd; 95 int n, fd;
96 struct stat sb; 96 struct stat sb;
@@ -131,7 +131,7 @@ RAND_write_file(const char *file)
131 131
132 fclose(out); 132 fclose(out);
133 OPENSSL_cleanse(buf, BUFSIZE); 133 OPENSSL_cleanse(buf, BUFSIZE);
134 return (rand_err ? -1 : ret); 134 return ret;
135} 135}
136 136
137const char * 137const char *
diff --git a/src/lib/libssl/src/crypto/rand/randfile.c b/src/lib/libssl/src/crypto/rand/randfile.c
index e54a009420..6948a83634 100644
--- a/src/lib/libssl/src/crypto/rand/randfile.c
+++ b/src/lib/libssl/src/crypto/rand/randfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: randfile.c,v 1.40 2014/10/22 13:02:04 jsing Exp $ */ 1/* $OpenBSD: randfile.c,v 1.41 2015/07/18 22:46:42 beck 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 *
@@ -90,7 +90,7 @@ int
90RAND_write_file(const char *file) 90RAND_write_file(const char *file)
91{ 91{
92 unsigned char buf[BUFSIZE]; 92 unsigned char buf[BUFSIZE];
93 int i, ret = 0, rand_err = 0; 93 int i, ret = 0;
94 FILE *out = NULL; 94 FILE *out = NULL;
95 int n, fd; 95 int n, fd;
96 struct stat sb; 96 struct stat sb;
@@ -131,7 +131,7 @@ RAND_write_file(const char *file)
131 131
132 fclose(out); 132 fclose(out);
133 OPENSSL_cleanse(buf, BUFSIZE); 133 OPENSSL_cleanse(buf, BUFSIZE);
134 return (rand_err ? -1 : ret); 134 return ret;
135} 135}
136 136
137const char * 137const char *