1
diff --git a/debian/changelog b/debian/changelog
2
index 01fad6a..6d51bd9 100644
3
--- a/debian/changelog
4
+++ b/debian/changelog
5
@@ -1,3 +1,13 @@
6
1
ssl-cert (1.0.39ubuntu1) hirsute; urgency=medium
7
2
8
3
  * make-ssl-cert: Add a --expiration-days parameter
9
4
    (LP: #1853021)
10
5
    - This parameter enables users to customize the expiration of self-signed
11
6
      certificates.
12
7
  * d/control: Update git links to salsa
13
8
14
9
 -- Bryce Harrington <bryce@canonical.com>  Fri, 13 Nov 2020 00:39:17 +0000
15
10
16
1
ssl-cert (1.0.39) unstable; urgency=medium
11
ssl-cert (1.0.39) unstable; urgency=medium
17
2
12
18
3
  * Always put the common name also in the SubjectAltName. This is required
13
  * Always put the common name also in the SubjectAltName. This is required
19
diff --git a/debian/control b/debian/control
20
index 324d965..f958433 100644
21
--- a/debian/control
22
+++ b/debian/control
23
@@ -1,12 +1,13 @@
24
1
Source: ssl-cert
1
Source: ssl-cert
25
2
Section: utils
2
Section: utils
26
3
Priority: optional
3
Priority: optional
28
4
Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
29
5
XSBC-Original-Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
30
5
Uploaders: Tollef Fog Heen <tfheen@debian.org>, Stefan Fritsch <sf@debian.org>
6
Uploaders: Tollef Fog Heen <tfheen@debian.org>, Stefan Fritsch <sf@debian.org>
31
6
Build-Depends: debhelper (>= 7), po-debconf
7
Build-Depends: debhelper (>= 7), po-debconf
32
7
Standards-Version: 3.9.8
8
Standards-Version: 3.9.8
35
8
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/ssl-cert.git
9
Vcs-Git: https://salsa.debian.org/apache-team/ssl-cert.git
36
9
Vcs-Git: git://anonscm.debian.org/pkg-apache/ssl-cert.git
10
Vcs-Browser: https://salsa.debian.org/apache-team/ssl-cert
37
10
11
38
11
Package: ssl-cert
12
Package: ssl-cert
39
12
Architecture: all
13
Architecture: all
40
diff --git a/make-ssl-cert b/make-ssl-cert
41
index 152e9f9..ded374a 100755
42
--- a/make-ssl-cert
43
+++ b/make-ssl-cert
44
@@ -6,6 +6,20 @@
45
6
db_version 2.0
6
db_version 2.0
46
7
db_capb backup
7
db_capb backup
47
8
8
48
9
progname=$(basename "${0}")
49
10
50
11
usage() {
51
12
    cat >&2 <<EOF
52
13
Usage: ${progname} [options] <template> <output>
53
14
       ${progname} [options] generate-default-snakeoil
54
15
55
16
Options:
56
17
       --force-overwrite
57
18
       --expiration-days=<days>
58
19
EOF
59
20
    exit "${1}"
60
21
}
61
22
62
9
ask_via_debconf() {
23
ask_via_debconf() {
63
10
    RET=""
24
    RET=""
64
11
    if db_settitle make-ssl-cert/title ; then
25
    if db_settitle make-ssl-cert/title ; then
65
@@ -56,35 +70,60 @@ create_temporary_cnf() {
66
56
    sed -e s#@HostName@#"$HostName"# -e s#@SubjectAltName@#"$SubjectAltName"# $template > $TMPFILE
70
    sed -e s#@HostName@#"$HostName"# -e s#@SubjectAltName@#"$SubjectAltName"# $template > $TMPFILE
67
57
}
71
}
68
58
72
76
59
# Takes two arguments, the base layout and the output cert.
73
# Process arguments
77
60
74
subcommand=
78
61
if [ $# -lt 2 ] && [ "$1" != "generate-default-snakeoil" ]; then
75
opt_force_overwrite="false"
79
62
    printf "Usage: $0 template output [--force-overwrite]\n";
76
opt_expiration_days="3650"
80
63
    printf "Usage: $0 generate-default-snakeoil [--force-overwrite]\n";
77
for arg in "${@}"; do
81
64
    exit 1;
78
    case "${arg}" in
82
65
fi
79
        --help | -h | \?)
83
80
            usage 0
84
81
            ;;
85
82
        --force-overwrite)
86
83
            opt_force_overwrite="true"
87
84
            ;;
88
85
        --expiration-days=*)
89
86
            opt_expiration_days="${arg#*=}"
90
87
            ;;
91
88
        generate-default-snakeoil)
92
89
            subcommand="generate-default-snakeoil"
93
90
            ;;
94
91
        --*)
95
92
            printf "Unrecognized option ${arg}\n\n"
96
93
            usage 1
97
94
            ;;
98
95
        *)
99
96
            subcommand="manual"
100
97
            template="${arg}"
101
98
            ;;
102
99
    esac
103
100
    shift
104
101
done
105
102
106
103
if [ "${subcommand}" = "manual" ]; then
107
104
    output="${1}"
108
105
    [ -n "${output}" ] || usage 1
109
66
106
110
67
if [ "$1" != "generate-default-snakeoil" ]; then
111
68
    template="$1"
112
69
    output="$2"
113
70
    # be anal in manual mode.
107
    # be anal in manual mode.
114
71
    if [ ! -f $template ]; then
108
    if [ ! -f $template ]; then
115
72
	printf "Could not open template file: $template!\n";
109
	printf "Could not open template file: $template!\n";
116
73
	exit 1;
110
	exit 1;
117
74
    fi
111
    fi
119
75
    if [ -f $output ] && [ "$3" != "--force-overwrite" ]; then
112
    if [ -f $output ] && [ "${opt_force_overwrite}" != "true" ]; then
120
76
        printf "$output file already exists!\n";
113
        printf "$output file already exists!\n";
121
77
        exit 1;
114
        exit 1;
122
78
    fi
115
    fi
123
79
    ask_via_debconf
116
    ask_via_debconf
125
80
else
117
elif [ "${subcommand}" = "generate-default-snakeoil" ]; then
126
81
    template="/usr/share/ssl-cert/ssleay.cnf"
118
    template="/usr/share/ssl-cert/ssleay.cnf"
127
82
    if [ -f "/etc/ssl/certs/ssl-cert-snakeoil.pem" ] && [ -f "/etc/ssl/private/ssl-cert-snakeoil.key" ]; then
119
    if [ -f "/etc/ssl/certs/ssl-cert-snakeoil.pem" ] && [ -f "/etc/ssl/private/ssl-cert-snakeoil.key" ]; then
130
83
        if [ "$2" != "--force-overwrite" ]; then
120
        if [ "${opt_force_overwrite}" != "true" ]; then
131
84
             exit 0
121
            exit 0
132
85
        fi
122
        fi
133
86
    fi
123
    fi
134
87
    make_snakeoil
124
    make_snakeoil
135
125
else
136
126
    usage 1
137
88
fi
127
fi
138
89
128
139
90
# # should be a less common char
129
# # should be a less common char
140
@@ -102,8 +141,8 @@ create_temporary_cnf
141
102
141
142
103
umask 077
142
umask 077
143
104
143
146
105
if [ "$1" != "generate-default-snakeoil" ]; then
144
if [ "${subcommand}" = "manual" ]; then
147
106
    if ! openssl req -config $TMPFILE -new -x509 -days 3650 -nodes -sha256 \
145
    if ! openssl req -config $TMPFILE -new -x509 -days ${opt_expiration_days} -nodes -sha256 \
148
107
	-out $output -keyout $output > $TMPOUT 2>&1
146
	-out $output -keyout $output > $TMPOUT 2>&1
149
108
    then
147
    then
150
109
	echo Could not create certificate. Openssl output was: >&2
148
	echo Could not create certificate. Openssl output was: >&2
151
@@ -114,8 +153,8 @@ if [ "$1" != "generate-default-snakeoil" ]; then
152
114
    # hash symlink
153
    # hash symlink
153
115
    cd $(dirname $output)
154
    cd $(dirname $output)
154
116
    ln -sf $(basename $output) $(openssl x509 -hash -noout -in $(basename $output))
155
    ln -sf $(basename $output) $(openssl x509 -hash -noout -in $(basename $output))
157
117
else
156
elif [ "${subcommand}" = "generate-default-snakeoil" ]; then
158
118
    if ! openssl req -config $TMPFILE -new -x509 -days 3650 -nodes -sha256 \
157
    if ! openssl req -config $TMPFILE -new -x509 -days ${opt_expiration_days} -nodes -sha256 \
159
119
	-out /etc/ssl/certs/ssl-cert-snakeoil.pem \
158
	-out /etc/ssl/certs/ssl-cert-snakeoil.pem \
160
120
        -keyout /etc/ssl/private/ssl-cert-snakeoil.key > $TMPOUT 2>&1
159
        -keyout /etc/ssl/private/ssl-cert-snakeoil.key > $TMPOUT 2>&1
161
121
    then
160
    then
Reviewer	Date Requested	Status
Christian Ehrhardt  (community)	2020-11-14	Approve on 2020-11-19
Paride Legovini (community)	2020-11-14	Needs Information on 2020-11-17
Canonical Server	2020-11-19	Pending
git-ubuntu developers	2020-11-14	Pending
Review via email: mp+393784@code.launchpad.net