From 76d3cb65aed1b2e454d129eb1e187e896f5e3a2a Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 15 Jun 2015 20:18:50 +0200
Subject: Update to openssl-1.0.2c

Conflicts:
	openssl/Makefile
---
 openssl/tools/Makefile    | 2 ++
 openssl/tools/c_rehash    | 6 +++---
 openssl/tools/c_rehash.in | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'openssl/tools')

diff --git a/openssl/tools/Makefile b/openssl/tools/Makefile
index bb6fb71f3..c1a2f6bcc 100644
--- a/openssl/tools/Makefile
+++ b/openssl/tools/Makefile
@@ -44,6 +44,8 @@ tags:
 
 errors:
 
+update: depend
+
 depend:
 
 dclean:
diff --git a/openssl/tools/c_rehash b/openssl/tools/c_rehash
index 4a0f0e10e..6a27c0224 100644
--- a/openssl/tools/c_rehash
+++ b/openssl/tools/c_rehash
@@ -15,13 +15,13 @@ my $symlink_exists=eval {symlink("",""); 1};
 my $removelinks = 1;
 
 ##  Parse flags.
-while ( $ARGV[0] =~ '-.*' ) {
+while ( $ARGV[0] =~ /^-/ ) {
     my $flag = shift @ARGV;
     last if ( $flag eq '--');
-    if ( $flag =~ /-old/) {
+    if ( $flag eq '-old') {
 	    $x509hash = "-subject_hash_old";
 	    $crlhash = "-hash_old";
-    } elsif ( $flag =~ /-h/) {
+    } elsif ( $flag eq '-h') {
 	    help();
     } elsif ( $flag eq '-n' ) {
 	    $removelinks = 0;
diff --git a/openssl/tools/c_rehash.in b/openssl/tools/c_rehash.in
index 887e92712..b086ff9cf 100644
--- a/openssl/tools/c_rehash.in
+++ b/openssl/tools/c_rehash.in
@@ -15,13 +15,13 @@ my $symlink_exists=eval {symlink("",""); 1};
 my $removelinks = 1;
 
 ##  Parse flags.
-while ( $ARGV[0] =~ '-.*' ) {
+while ( $ARGV[0] =~ /^-/ ) {
     my $flag = shift @ARGV;
     last if ( $flag eq '--');
-    if ( $flag =~ /-old/) {
+    if ( $flag eq '-old') {
 	    $x509hash = "-subject_hash_old";
 	    $crlhash = "-hash_old";
-    } elsif ( $flag =~ /-h/) {
+    } elsif ( $flag eq '-h') {
 	    help();
     } elsif ( $flag eq '-n' ) {
 	    $removelinks = 0;
-- 
cgit v1.2.3