[Openvpn-devel] [PATCH] Properly detect OpenSSL version strings with numbers only

[Simon Deziel]

whichopensslcnf failed to return the right cnf for:

$ openssl version
OpenSSL 1.0.1 14 Mar 2012

Signed-off-by: Simon Deziel <simon.dez...@gmail.com>
---
 easy-rsa/2.0/whichopensslcnf |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/easy-rsa/2.0/whichopensslcnf b/easy-rsa/2.0/whichopensslcnf
index 2226a8e..ccdaf50 100755
--- a/easy-rsa/2.0/whichopensslcnf
+++ b/easy-rsa/2.0/whichopensslcnf
@@ -3,11 +3,11 @@
 cnf="$1/openssl.cnf"

 if [ "$OPENSSL" ]; then
-       if $OPENSSL version | grep -E "0\.9\.6[[:alnum:]]" > /dev/null; then
+       if $OPENSSL version | grep -E "0\.9\.6[[:alnum:]]?" > /dev/null;
then
                cnf="$1/openssl-0.9.6.cnf"
-       elif $OPENSSL version | grep -E "0\.9\.8[[:alnum:]]" >
/dev/null; then
+       elif $OPENSSL version | grep -E "0\.9\.8[[:alnum:]]?" >
/dev/null; then
                cnf="$1/openssl-0.9.8.cnf"
-       elif $OPENSSL version | grep -E "1\.0\.([[:digit:]][[:alnum:]])"
> /dev/null; then
+       elif $OPENSSL version | grep -E "1\.0\.[[:digit:]][[:alnum:]]?"
> /dev/null; then
                 cnf="$1/openssl-1.0.0.cnf"
        else
                cnf="$1/openssl.cnf"
-- 
1.7.5.4