Commit d15711ef authored by Ben Laurie's avatar Ben Laurie
Browse files

Handle read errors.

parent 25ace3ed

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ 
 

 Changes between 0.9.6d and 0.9.7  [XX xxx 2002]



  *) Improve diagnostics in file reading and command-line digests.

     [Ben Laurie aided and abetted by Solar Designer <solar@openwall.com>]



  *) Add AES modes CFB and OFB to the object database.  Correct an

     error in AES-CFB decryption.

     [Richard Levitte]

apps/dgst.c

+43 −13
Original line number Diff line number Diff line
@@ -73,8 +73,9 @@ 
#undef PROG

#define PROG	dgst_main



void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

		EVP_PKEY *key, unsigned char *sigin, int siglen);

int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,

	  const char *file);



int MAIN(int, char **);
@@ -319,22 +320,36 @@ int MAIN(int argc, char **argv) 
	if (argc == 0)

		{

		BIO_set_fp(in,stdin,BIO_NOCLOSE);

		do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf, siglen);

		err=do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf,

			  siglen,"","(stdin)");

		}

	else

		{

		name=OBJ_nid2sn(md->type);

		for (i=0; i<argc; i++)

			{

			char *tmp,*tofree=NULL;

			int r;



			if (BIO_read_filename(in,argv[i]) <= 0)

				{

				perror(argv[i]);

				err++;

				continue;

				}

			if(!out_bin) BIO_printf(out, "%s(%s)= ",name,argv[i]);

			do_fp(out, buf,inp,separator, out_bin, sigkey, 

								sigbuf, siglen);

			if(!out_bin)

				{

				tmp=tofree=OPENSSL_malloc(strlen(name)+strlen(argv[i])+5);

				sprintf(tmp,"%s(%s)= ",name,argv[i]);

				}

			else

				tmp="";

			r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,

				siglen,tmp,argv[i]);

			if(r)

			    err=r;

			if(tofree)

				OPENSSL_free(tofree);

			(void)BIO_reset(bmd);

			}

		}
@@ -353,8 +368,9 @@ end: 
	EXIT(err);

	}



void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

			EVP_PKEY *key, unsigned char *sigin, int siglen)

int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,

	  const char *file)

	{

	int len;

	int i;
@@ -362,21 +378,33 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, 
	for (;;)

		{

		i=BIO_read(bp,(char *)buf,BUFSIZE);

		if (i <= 0) break;

		if(i < 0)

			{

			BIO_printf(bio_err, "Read Error in %s\n",file);

			ERR_print_errors(bio_err);

			return 1;

			}

		if (i == 0) break;

		}

	if(sigin)

		{

		EVP_MD_CTX *ctx;

		BIO_get_md_ctx(bp, &ctx);

		i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 

		if(i > 0) BIO_printf(out, "Verified OK\n");

		else if(i == 0) BIO_printf(out, "Verification Failure\n");

		if(i > 0)

			BIO_printf(out, "Verified OK\n");

		else if(i == 0)

			{

			BIO_printf(out, "Verification Failure\n");

			return 1;

			}

		else

			{

			BIO_printf(bio_err, "Error Verifying Data\n");

			ERR_print_errors(bio_err);

			return 1;

			}

		return;

		return 0;

		}

	if(key)

		{
@@ -386,7 +414,7 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, 
			{

			BIO_printf(bio_err, "Error Signing Data\n");

			ERR_print_errors(bio_err);

			return;

			return 1;

			}

		}

	else
@@ -395,6 +423,7 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, 
	if(binout) BIO_write(out, buf, len);

	else 

		{

		BIO_write(out,title,strlen(title));

		for (i=0; i<len; i++)

			{

			if (sep && (i != 0))
@@ -403,5 +432,6 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, 
			}

		BIO_printf(out, "\n");

		}

	return 0;

	}

crypto/bio/bio.h

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ void ERR_load_BIO_strings(void); 
#define BIO_F_CONN_CTRL					 127

#define BIO_F_CONN_STATE				 115

#define BIO_F_FILE_CTRL					 116

#define BIO_F_FILE_READ					 130

#define BIO_F_LINEBUFFER_CTRL				 129

#define BIO_F_MEM_READ					 128

#define BIO_F_MEM_WRITE					 117

crypto/bio/bio_err.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ static ERR_STRING_DATA BIO_str_functs[]= 
{ERR_PACK(0,BIO_F_CONN_CTRL,0),	"CONN_CTRL"},

{ERR_PACK(0,BIO_F_CONN_STATE,0),	"CONN_STATE"},

{ERR_PACK(0,BIO_F_FILE_CTRL,0),	"FILE_CTRL"},

{ERR_PACK(0,BIO_F_FILE_READ,0),	"FILE_READ"},

{ERR_PACK(0,BIO_F_LINEBUFFER_CTRL,0),	"LINEBUFFER_CTRL"},

{ERR_PACK(0,BIO_F_MEM_READ,0),	"MEM_READ"},

{ERR_PACK(0,BIO_F_MEM_WRITE,0),	"MEM_WRITE"},

crypto/bio/bss_file.c

+6 −0
Original line number Diff line number Diff line
@@ -162,6 +162,12 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl) 
	if (b->init && (out != NULL))

		{

		ret=fread(out,1,(int)outl,(FILE *)b->ptr);

		if(ret == 0 && ferror((FILE *)b->ptr))

			{

			SYSerr(SYS_F_FREAD,get_last_sys_error());

			BIOerr(BIO_F_FILE_READ,ERR_R_SYS_LIB);

			ret=-1;

			}

		}

	return(ret);

	}