← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openvpn/utopic-proposed

« back to all changes in this revision

Viewing changes to easy-rsa/2.0/whichopensslcnf

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-31 04:55:56 UTC
  • mfrom: (1.1.18) (10.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20111231045556-3fwmrbggevr9iqxd
Tags: 2.2.1-3ubuntu1
https://launchpad.net/bugs/794916
* Merge from Debian testing.  Remaining changes:
 + debian/openvpn.init.d:
    - Do not use start-stop-daemon and </dev/null to avoid blocking boot.
    - Show per-VPN result messages.
    - Add "--script-security 2" by default for backwards compatabliity.
  + debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc()
  + debian/update-resolv-conf: Support multiple domains.
  + fix bug where '--script-security 2' would be passed for all
    daemons after the first. (LP: #794916)

Show diffs side-by-side

added added

removed removed

Lines of Context:
easy-rsa/2.0/whichopensslcnf
1
1
#!/bin/sh
2
2
 
 
3
cnf="$1/openssl.cnf"
 
4
 
3
5
if [ "$OPENSSL" ]; then
4
 
        if $OPENSSL version | grep 0.9.6 > /dev/null; then
5
 
                echo "$1/openssl-0.9.6.cnf"
 
6
        if $OPENSSL version | grep -E "0\.9\.6[[:alnum:]]" > /dev/null; then
 
7
                cnf="$1/openssl-0.9.6.cnf"
 
8
        elif $OPENSSL version | grep -E "0\.9\.8[[:alnum:]]" > /dev/null; then
 
9
                cnf="$1/openssl-0.9.8.cnf"
 
10
        elif $OPENSSL version | grep -E "1\.0\.([[:digit:]][[:alnum:]])" > /dev/null; then
 
11
                cnf="$1/openssl-1.0.0.cnf"
6
12
        else
7
 
                echo "$1/openssl.cnf"
 
13
                cnf="$1/openssl.cnf"
8
14
        fi
9
 
else
10
 
        echo "$1/openssl.cnf"
 
15
fi
 
16
 
 
17
echo $cnf
 
18
 
 
19
if [ ! -r $cnf ]; then
 
20
    echo "**************************************************************" >&2
 
21
    echo "  No $cnf file could be found" >&2
 
22
    echo "  Further invocations will fail" >&2
 
23
    echo "**************************************************************" >&2
11
24
fi
12
25
 
13
26
exit 0