summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xsca-cpp/trunk/modules/http/httpd-ca-conf4
-rwxr-xr-xsca-cpp/trunk/modules/http/httpd-cert-conf2
-rwxr-xr-xsca-cpp/trunk/modules/http/httpd-ssl-conf2
3 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-ca-conf b/sca-cpp/trunk/modules/http/httpd-ca-conf
index f59ff71d46..c5a3f8e894 100755
--- a/sca-cpp/trunk/modules/http/httpd-ca-conf
+++ b/sca-cpp/trunk/modules/http/httpd-ca-conf
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a test certificate of authority
+# Generate a test certification authority certificate
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
host=$2
@@ -84,6 +84,6 @@ rm -f $root/conf/ca-database
echo 1000 > $root/conf/ca-serial
touch $root/conf/ca-database
-# Generate the certificate of authority
+# Generate the certification authority certificate
openssl req -new -x509 -config $root/conf/openssl-ca.conf -out $root/conf/ca.crt -keyout $root/conf/ca.key
diff --git a/sca-cpp/trunk/modules/http/httpd-cert-conf b/sca-cpp/trunk/modules/http/httpd-cert-conf
index 7bf22d4668..b6dc8ebd6f 100755
--- a/sca-cpp/trunk/modules/http/httpd-cert-conf
+++ b/sca-cpp/trunk/modules/http/httpd-cert-conf
@@ -50,7 +50,7 @@ EOF
# Generate a certificate request
openssl req -new -config $root/conf/openssl-cert.conf -out $root/conf/server-req.crt -keyout $root/conf/server.key
-# Generate a certificate, signed with our test certificate of authority
+# Generate a certificate, signed with our test certification authority certificate
openssl ca -batch -config $root/conf/openssl-ca.conf -out $root/conf/server.crt -infiles $root/conf/server-req.crt
# Export it to PKCS12 format, that's the format Web browsers want to import
diff --git a/sca-cpp/trunk/modules/http/httpd-ssl-conf b/sca-cpp/trunk/modules/http/httpd-ssl-conf
index b064dc02dc..ef4c0c1a71 100755
--- a/sca-cpp/trunk/modules/http/httpd-ssl-conf
+++ b/sca-cpp/trunk/modules/http/httpd-ssl-conf
@@ -65,7 +65,7 @@ CustomLog $root/logs/ssl_access_log sslcombined
LogLevel warn
# Require clients to present either:
-# a certificate signed with our CA certificate of authority
+# a certificate signed with our certification authority certificate
# or a userid + password for HTTP basic authentication
<Location />
Satisfy Any