[openca-cvsdev] CVS: openca-0.9/src/modules/openca-openssl OpenSSL.pm,1.55,1.56

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-openssl
In directory usw-pr-cvs1:/tmp/cvs-serv2129/modules/openca-openssl

Modified Files:
	OpenSSL.pm 
Log Message:
remove several tempfiles


Index: OpenSSL.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-openssl/OpenSSL.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** OpenSSL.pm	24 Jun 2002 11:58:16 -0000	1.55
--- OpenSSL.pm	24 Jun 2002 12:21:58 -0000	1.56
***************
*** 708,711 ****
--- 708,712 ----
  		$self->setError (7722021,
  				"OpenCA::OpenSSL->dataConvert: The datatype which should be converted is not known.");
+ 		unlink ($infile) if ($data);
  		return undef;
  	}
***************
*** 785,788 ****
--- 786,790 ----
  		$self->setError (7722069, "OpenCA::OpenSSL->dataConvert: ".
  				"Unkown Error detected before OpenSSL starts (".$?.").");
+ 		unlink ($infile) if ($data);
  		return undef;
  	}
***************
*** 797,800 ****
--- 799,803 ----
  			$self->setError (7722071,
  					"OpenCA::OpenSSL->dataConvert: Cannot open pipe to OpenSSL.");
+ 			unlink ($infile) if ($data);
  			return undef;
  		}
***************
*** 809,816 ****
--- 812,823 ----
  		} else {
  			$self->setError (7722073, "OpenCA::OpenSSL->dataConvert: OpenSSL failed (".$?.").");
+ 			unlink ($tmpfile) if (not $keys->{OUTFILE});
+ 			unlink ($infile) if ($data);
  			return undef;
  		}
  	}
  
+ 	unlink ($infile) if ($data);
+ 
  	delete($ENV{'pwd'});
  	delete($ENV{'pempwd'});
***************
*** 821,824 ****
--- 828,832 ----
  	if( $? != 0 ) {
  		$self->setError (7722075, "OpenCA::OpenSSL->dataConvert: OpenSSL failed (".$?.").");
+ 		unlink ($tmpfile) if (not $keys->{OUTFILE});
  		return undef;
  	}
***************
*** 826,830 ****
  	if( exists $keys->{OUTFILE} ) {
  		print "OpenCA::OpenSSL->dataConvert: return 1 and infile deleted if temporary<br>\n" if ($self->{DEBUG});
- 		unlink ($infile) if ($data);
  		return 1;
  	}
--- 834,837 ----
***************
*** 833,837 ****
  	if (not open( TMP, "<$outfile" )) {
  		print "OpenCA::OpenSSL->dataConvert: cannot read outfile $outfile<br>\n" if ($self->{DEBUG});
- 		unlink ($infile) if ($data);
  		$self->setError (7722081, "OpenCA::OpenSSL->dataConvert: Cannot open outfile $outfile for reading.");
  		return undef;
--- 840,843 ----
***************
*** 841,845 ****
  	}
  	close( TMP );
- 	unlink ($infile) if ($data);
  	unlink ($outfile);
  
--- 847,850 ----
***************
*** 1455,1458 ****
--- 1460,1464 ----
  		if (not open FD, ">".$keyfile) {
  			$self->setError (7743033, "OpenCA::OpenSSL->sign: Cannot open keyfile $keyfile for writing.");
+ 			unlink ($datafile) if ($data);
  			return undef;
  		}
***************
*** 1466,1469 ****
--- 1472,1477 ----
  		if (not open FD, ">".$certfile) {
  			$self->setError (7743035, "OpenCA::OpenSSL->sign: Cannot open certfile $certfile for writing.");
+ 			unlink ($datafile) if ($data);
+ 			unlink ($keyfile) if ($key);
  			return undef;
  		}