[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Thu Apr 7 19:09:35 UTC 2016
The branch master has been updated
via 02b91dcf1cdd2fc75ecdb47d2fba2936e840ed3c (commit)
via 800b299b0a53c871be57c4b2c97c95d6642489ea (commit)
from a4ccf06808422400a6a0673b452d388e95a455fd (commit)
- Log -----------------------------------------------------------------
commit 02b91dcf1cdd2fc75ecdb47d2fba2936e840ed3c
Author: Andy Polyakov <appro at openssl.org>
Date: Wed Apr 6 11:31:31 2016 +0200
test/[dane|evp_]test.c: BIO-fy file I/O.
Reviewed-by: Richard Levitte <levitte at openssl.org>
commit 800b299b0a53c871be57c4b2c97c95d6642489ea
Author: Andy Polyakov <appro at openssl.org>
Date: Wed Apr 6 11:21:14 2016 +0200
bio/bss_file.c: since VS2015 one can't tell apart own and "alien" FILE
pointers, except for minimal std[in|out|err].
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/bio/bss_file.c | 7 +++++--
test/danetest.c | 16 ++++++++--------
test/evp_test.c | 22 +++++++++++-----------
3 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 643a855..081c7f1 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -241,7 +241,7 @@ static int file_read(BIO *b, char *out, int outl)
ret = fread(out, 1, (int)outl, (FILE *)b->ptr);
if (ret == 0
&& (b->flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) :
- ferror((FILE *)b->ptr)) {
+ ferror((FILE *)b->ptr)) {
SYSerr(SYS_F_FREAD, get_last_sys_error());
BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB);
ret = -1;
@@ -308,8 +308,11 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
# if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
# define _IOB_ENTRIES 20
# endif
-# if defined(_IOB_ENTRIES)
/* Safety net to catch purely internal BIO_set_fp calls */
+# if defined(_MSC_VER) && _MSC_VER>=1900
+ if (ptr == stdin || ptr == stdout || ptr == stderr)
+ BIO_clear_flags(b, BIO_FLAGS_UPLINK);
+# elif defined(_IOB_ENTRIES)
if ((size_t)ptr >= (size_t)stdin &&
(size_t)ptr < (size_t)(stdin + _IOB_ENTRIES))
BIO_clear_flags(b, BIO_FLAGS_UPLINK);
diff --git a/test/danetest.c b/test/danetest.c
index 9b7ac1d..5bca1aa 100644
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -146,7 +146,7 @@ static int verify_chain(SSL *ssl, STACK_OF(X509) *chain)
return (ret);
}
-static STACK_OF(X509) *load_chain(FILE *fp, int nelem)
+static STACK_OF(X509) *load_chain(BIO *fp, int nelem)
{
int count;
char *name = 0;
@@ -164,7 +164,7 @@ static STACK_OF(X509) *load_chain(FILE *fp, int nelem)
for (count = 0;
count < nelem && errtype == 0
- && PEM_read(fp, &name, &header, &data, &len);
+ && PEM_read_bio(fp, &name, &header, &data, &len);
++count) {
const unsigned char *p = data;
@@ -211,12 +211,12 @@ err:
return NULL;
}
-static char *read_to_eol(FILE *f)
+static char *read_to_eol(BIO *f)
{
static char buf[1024];
int n;
- if (fgets(buf, sizeof(buf), f)== NULL)
+ if (!BIO_gets(f, buf, sizeof(buf)))
return NULL;
n = strlen(buf);
@@ -359,7 +359,7 @@ static int allws(const char *cp)
}
static int test_tlsafile(SSL_CTX *ctx, const char *basename,
- FILE *f, const char *path)
+ BIO *f, const char *path)
{
char *line;
int testno = 0;
@@ -463,7 +463,7 @@ static int test_tlsafile(SSL_CTX *ctx, const char *basename,
int main(int argc, char *argv[])
{
- FILE *f;
+ BIO *f;
BIO *bio_err;
SSL_CTX *ctx = NULL;
const char *basedomain;
@@ -488,7 +488,7 @@ int main(int argc, char *argv[])
CRYPTO_set_mem_debug(1);
CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
- f = fopen(tlsafile, "r");
+ f = BIO_new_file(tlsafile, "r");
if (f == NULL) {
fprintf(stderr, "%s: Error opening tlsa record file: '%s': %s\n",
progname, tlsafile, strerror(errno));
@@ -523,7 +523,7 @@ int main(int argc, char *argv[])
end:
- (void) fclose(f);
+ BIO_free(f);
SSL_CTX_free(ctx);
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
diff --git a/test/evp_test.c b/test/evp_test.c
index e422545..2e3987c 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -240,7 +240,7 @@ static int test_uint64(const char *value, uint64_t *pr)
/* Structure holding test information */
struct evp_test {
/* file being read */
- FILE *in;
+ BIO *in;
/* List of public and private keys */
struct key_list *private;
struct key_list *public;
@@ -465,8 +465,8 @@ static int process_test(struct evp_test *t, char *buf, int verbose)
if (!parse_line(&keyword, &value, buf))
return 1;
if (strcmp(keyword, "PrivateKey") == 0) {
- save_pos = ftell(t->in);
- pk = PEM_read_PrivateKey(t->in, NULL, 0, NULL);
+ save_pos = BIO_tell(t->in);
+ pk = PEM_read_bio_PrivateKey(t->in, NULL, 0, NULL);
if (pk == NULL && !check_unsupported()) {
fprintf(stderr, "Error reading private key %s\n", value);
ERR_print_errors_fp(stderr);
@@ -476,8 +476,8 @@ static int process_test(struct evp_test *t, char *buf, int verbose)
add_key = 1;
}
if (strcmp(keyword, "PublicKey") == 0) {
- save_pos = ftell(t->in);
- pk = PEM_read_PUBKEY(t->in, NULL, 0, NULL);
+ save_pos = BIO_tell(t->in);
+ pk = PEM_read_bio_PUBKEY(t->in, NULL, 0, NULL);
if (pk == NULL && !check_unsupported()) {
fprintf(stderr, "Error reading public key %s\n", value);
ERR_print_errors_fp(stderr);
@@ -501,8 +501,8 @@ static int process_test(struct evp_test *t, char *buf, int verbose)
key->next = *lst;
*lst = key;
/* Rewind input, read to end and update line numbers */
- fseek(t->in, save_pos, SEEK_SET);
- while (fgets(tmpbuf, sizeof(tmpbuf), t->in)) {
+ (void)BIO_seek(t->in, save_pos);
+ while (BIO_gets(t->in,tmpbuf, sizeof(tmpbuf))) {
t->line++;
if (strncmp(tmpbuf, "-----END", 8) == 0)
return 1;
@@ -584,7 +584,7 @@ static int check_output(struct evp_test *t,
int main(int argc, char **argv)
{
- FILE *in = NULL;
+ BIO *in = NULL;
char buf[10240];
struct evp_test t;
@@ -597,9 +597,9 @@ int main(int argc, char **argv)
memset(&t, 0, sizeof(t));
t.start_line = -1;
- in = fopen(argv[1], "r");
+ in = BIO_new_file(argv[1], "r");
t.in = in;
- while (fgets(buf, sizeof(buf), in)) {
+ while (BIO_gets(in, buf, sizeof(buf))) {
t.line++;
if (!process_test(&t, buf, 0))
exit(1);
@@ -611,7 +611,7 @@ int main(int argc, char **argv)
t.ntests, t.errors, t.nskip);
free_key_list(t.public);
free_key_list(t.private);
- fclose(in);
+ BIO_free(in);
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
if (CRYPTO_mem_leaks_fp(stderr) <= 0)
More information about the openssl-commits
mailing list