| author | Yiteng Zhang <yiteng.zhang@oracle.com> |
| Tue, 25 Oct 2016 14:43:21 -0700 | |
| branch | s11u3-sru |
| changeset 7255 | c7815ed3b336 |
| parent 6722 | f675056be479 |
| permissions | -rw-r--r-- |
|
3877
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
Will build SSL FIPS version of mod_ssl. Note that modules/ssl-fips-140 |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
need to be copied from modules/ssl before it can be applied. |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
It also makes sure that both mod_ssl versions contains right RPATH. |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
--- modules/ssl/config.m4 |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
+++ modules/ssl/config.m4 |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
@@ -44,6 +44,7 @@ |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
# structure, so ask libtool to hide everything else: |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
fi |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ APR_ADDTO(MOD_LDFLAGS, [-R/lib/openssl/default/64]) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
else |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
enable_ssl=no |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
fi |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
--- modules/ssl-fips-140/config.m4 |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+++ modules/ssl-fips-140/config.m4 |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
@@ -14,7 +14,7 @@ |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
dnl limitations under the License. |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
dnl # start of module specific part |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
-APACHE_MODPATH_INIT(ssl) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
+APACHE_MODPATH_INIT(ssl-fips-140) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
dnl # list of module object files |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
ssl_objs="dnl |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
@@ -36,7 +36,7 @@ |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
ssl_util_ocsp.lo dnl |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
" |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
dnl # hook module into the Autoconf mechanism (--enable-ssl option) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
-APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , most, [ |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
+APACHE_MODULE(ssl_fips, [SSL/TLS support (mod_ssl)], $ssl_objs, , most, [ |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
APACHE_CHECK_OPENSSL |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
if test "$ac_cv_openssl" = "yes" ; then |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
if test "x$enable_ssl" = "xshared"; then |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
@@ -44,14 +44,13 @@ |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
# structure, so ask libtool to hide everything else: |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
fi |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
+ APR_ADDTO(MOD_CFLAGS, [-I/usr/include/openssl/fips-140]) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
+ APR_ADDTO(MOD_LDFLAGS, [-R/lib/openssl/fips-140/64]) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
else |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
enable_ssl=no |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
fi |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
]) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
49 |
-# Ensure that other modules can pick up mod_ssl.h |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
- |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
dnl # end of module specific part |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
APACHE_MODPATH_FINISH |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |