1 |
diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/include/openssl_functions.php mezzanine_patched_phpki/phpki-0.82/include/openssl_functions.php |
2 |
--- phpki/phpki-0.82/include/openssl_functions.php 2007-01-04 07:47:57.000000000 +0100 |
3 |
+++ mezzanine_patched_phpki/phpki-0.82/include/openssl_functions.php 2008-12-05 05:02:22.000000000 +0100 |
4 |
@@ -59,8 +59,8 @@ |
5 |
default_days = 365 |
6 |
policy = policy_supplied |
7 |
|
8 |
-[ email_codesigning_cert ] |
9 |
-x509_extensions = email_codesigning_ext |
10 |
+[ email_signing_cert ] |
11 |
+x509_extensions = email_signing_ext |
12 |
default_days = 365 |
13 |
policy = policy_supplied |
14 |
|
15 |
@@ -122,7 +122,7 @@ |
16 |
nsRevocationUrl = ns_revoke_query.php? |
17 |
nsCaPolicyUrl = $config[base_url]policy.html |
18 |
|
19 |
-[ email_codesigning_ext ] |
20 |
+[ email_signing_ext ] |
21 |
basicConstraints = critical, CA:false |
22 |
keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment |
23 |
extendedKeyUsage = critical, emailProtection, clientAuth, codeSigning |
24 |
@@ -194,7 +194,7 @@ |
25 |
"; |
26 |
|
27 |
# Write out the config file. |
28 |
- $cnf_file = tempnam('./tmp','cnf-'); |
29 |
+ $cnf_file = tempnam('../../tmp','cnf-'); |
30 |
$handle = fopen($cnf_file,"w"); |
31 |
fwrite($handle, $cnf_contents); |
32 |
fclose($handle); |
33 |
diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/openssl.cnf mezzanine_patched_phpki/phpki-0.82/openssl.cnf |
34 |
--- phpki/phpki-0.82/openssl.cnf 2006-07-22 17:33:34.000000000 +0200 |
35 |
+++ mezzanine_patched_phpki/phpki-0.82/openssl.cnf 2008-12-05 05:04:23.000000000 +0100 |
36 |
@@ -29,8 +29,8 @@ |
37 |
default_days = 365 |
38 |
policy = policy_supplied |
39 |
|
40 |
-[ email_codesigning_cert ] |
41 |
-x509_extensions = email_codesigning_ext |
42 |
+[ email_signing_cert ] |
43 |
+x509_extensions = email_signing_ext |
44 |
default_days = 365 |
45 |
policy = policy_supplied |
46 |
|
47 |
@@ -82,7 +82,7 @@ |
48 |
nsCaPolicyUrl = http://www.somewhere.com/phpki/policy.html |
49 |
#nsSslServerName = |
50 |
|
51 |
-[ email_codesigning_ext ] |
52 |
+[ email_signing_ext ] |
53 |
basicConstraints = critical, CA:false |
54 |
keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment |
55 |
extendedKeyUsage = critical, emailProtection, clientAuth, codeSigning |