[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  0fd75c7e6e8482489135beb3f536546f27f6d0e5 (commit)
      from  b4faea50c35d92a67d1369355b49cc3efba78406 (commit)


- Log -----------------------------------------------------------------
commit 0fd75c7e6e8482489135beb3f536546f27f6d0e5
Author: Rich Salz <rsalz at akamai.com>
Date:   Sun May 3 08:45:27 2015 -0400

    GH271: Warning on </dev/null to CA.pl
    
    If CA.pl is reading from /dev/null, then "chop $FILE" gives a warning.
    Sigh.  Have to add "if $FILE".  This just silences a build warning.
    Thanks to GitHub user andrejs-igumenovs for help with this.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/CA.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/CA.pl.in b/apps/CA.pl.in
index 9d12a8c..5c8cdd0 100644
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -121,7 +121,7 @@ if ($WHAT eq '-newcert' ) {
     # ask user for existing CA certificate
     print "CA certificate filename (or enter to create)\n";
     $FILE = <STDIN>;
-    chop $FILE;
+    chop $FILE if $FILE;
     if ($FILE) {
         copy_pemfile($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
         copy_pemfile($FILE,"${CATOP}/$CACERT", "CERTIFICATE");