Commit 19674b5a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2253 

Submitted By: Ger Hobbelt <ger@hobbelt.com>

Check callback return value when outputting errors.
parent e855d538

apps/pkcs12.c

+10 −0
Original line number Diff line number Diff line
@@ -813,6 +813,16 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass, 
	default:

		BIO_printf (bio_err, "Warning unsupported bag type: ");

		i2a_ASN1_OBJECT (bio_err, bag->type);

{

unsigned char *foo = NULL;

int foolen;

FILE *op;

foolen = i2d_PKCS12_SAFEBAG(bag, &foo);

op = fopen("/tmp/unknown.der", "w");

fwrite(foo, 1, foolen, op);

fclose(op);

}



		BIO_printf (bio_err, "\n");

		return 1;

	break;

crypto/err/err_prn.c

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), 
		ERR_error_string_n(l, buf, sizeof buf);

		BIO_snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf,

			file, line, (flags & ERR_TXT_STRING) ? data : "");

		cb(buf2, strlen(buf2), u);

		if (cb(buf2, strlen(buf2), u) <= 0)

			break; /* abort outputting the error report */

		}

	}