Fossil SCM
merged in trunk [12272b7ff0].
Commit
a5fd64d344a3ae837df0b8ec9ad227305b3333d0
Parent
0c7be1fe6c70843…
3 files changed
+2
+1
-1
+1
-1
+2
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -104,10 +104,12 @@ | ||
| 104 | 104 | SSL_library_init(); |
| 105 | 105 | SSL_load_error_strings(); |
| 106 | 106 | ERR_load_BIO_strings(); |
| 107 | 107 | OpenSSL_add_all_algorithms(); |
| 108 | 108 | sslCtx = SSL_CTX_new(SSLv23_client_method()); |
| 109 | + /* Disable SSLv2 */ | |
| 110 | + SSL_CTX_set_options(sslCtx, SSL_OP_NO_SSLv2); | |
| 109 | 111 | |
| 110 | 112 | /* Set up acceptable CA root certificates */ |
| 111 | 113 | zCaSetting = db_get("ssl-ca-location", 0); |
| 112 | 114 | if( zCaSetting==0 || zCaSetting[0]=='\0' ){ |
| 113 | 115 | /* CA location not specified, use platform's default certificate store */ |
| 114 | 116 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -104,10 +104,12 @@ | |
| 104 | SSL_library_init(); |
| 105 | SSL_load_error_strings(); |
| 106 | ERR_load_BIO_strings(); |
| 107 | OpenSSL_add_all_algorithms(); |
| 108 | sslCtx = SSL_CTX_new(SSLv23_client_method()); |
| 109 | |
| 110 | /* Set up acceptable CA root certificates */ |
| 111 | zCaSetting = db_get("ssl-ca-location", 0); |
| 112 | if( zCaSetting==0 || zCaSetting[0]=='\0' ){ |
| 113 | /* CA location not specified, use platform's default certificate store */ |
| 114 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -104,10 +104,12 @@ | |
| 104 | SSL_library_init(); |
| 105 | SSL_load_error_strings(); |
| 106 | ERR_load_BIO_strings(); |
| 107 | OpenSSL_add_all_algorithms(); |
| 108 | sslCtx = SSL_CTX_new(SSLv23_client_method()); |
| 109 | /* Disable SSLv2 */ |
| 110 | SSL_CTX_set_options(sslCtx, SSL_OP_NO_SSLv2); |
| 111 | |
| 112 | /* Set up acceptable CA root certificates */ |
| 113 | zCaSetting = db_get("ssl-ca-location", 0); |
| 114 | if( zCaSetting==0 || zCaSetting[0]=='\0' ){ |
| 115 | /* CA location not specified, use platform's default certificate store */ |
| 116 |
+1
-1
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -229,11 +229,11 @@ | ||
| 229 | 229 | @ <li> |
| 230 | 230 | if( g.perm.History && g.perm.Read ){ |
| 231 | 231 | @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> |
| 232 | 232 | @ %h(zFile)</a> |
| 233 | 233 | }else{ |
| 234 | - @ <li>%h(zFile) | |
| 234 | + @ %h(zFile) | |
| 235 | 235 | } |
| 236 | 236 | @ added by %h(zUser) on |
| 237 | 237 | hyperlink_to_date(zDate, "."); |
| 238 | 238 | if( g.perm.WrWiki && g.perm.Attach ){ |
| 239 | 239 | @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] |
| 240 | 240 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -229,11 +229,11 @@ | |
| 229 | @ <li> |
| 230 | if( g.perm.History && g.perm.Read ){ |
| 231 | @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> |
| 232 | @ %h(zFile)</a> |
| 233 | }else{ |
| 234 | @ <li>%h(zFile) |
| 235 | } |
| 236 | @ added by %h(zUser) on |
| 237 | hyperlink_to_date(zDate, "."); |
| 238 | if( g.perm.WrWiki && g.perm.Attach ){ |
| 239 | @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] |
| 240 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -229,11 +229,11 @@ | |
| 229 | @ <li> |
| 230 | if( g.perm.History && g.perm.Read ){ |
| 231 | @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> |
| 232 | @ %h(zFile)</a> |
| 233 | }else{ |
| 234 | @ %h(zFile) |
| 235 | } |
| 236 | @ added by %h(zUser) on |
| 237 | hyperlink_to_date(zDate, "."); |
| 238 | if( g.perm.WrWiki && g.perm.Attach ){ |
| 239 | @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] |
| 240 |
+1
-1
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -229,11 +229,11 @@ | ||
| 229 | 229 | @ <li> |
| 230 | 230 | if( g.perm.History && g.perm.Read ){ |
| 231 | 231 | @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> |
| 232 | 232 | @ %h(zFile)</a> |
| 233 | 233 | }else{ |
| 234 | - @ <li>%h(zFile) | |
| 234 | + @ %h(zFile) | |
| 235 | 235 | } |
| 236 | 236 | @ added by %h(zUser) on |
| 237 | 237 | hyperlink_to_date(zDate, "."); |
| 238 | 238 | if( g.perm.WrWiki && g.perm.Attach ){ |
| 239 | 239 | @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] |
| 240 | 240 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -229,11 +229,11 @@ | |
| 229 | @ <li> |
| 230 | if( g.perm.History && g.perm.Read ){ |
| 231 | @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> |
| 232 | @ %h(zFile)</a> |
| 233 | }else{ |
| 234 | @ <li>%h(zFile) |
| 235 | } |
| 236 | @ added by %h(zUser) on |
| 237 | hyperlink_to_date(zDate, "."); |
| 238 | if( g.perm.WrWiki && g.perm.Attach ){ |
| 239 | @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] |
| 240 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -229,11 +229,11 @@ | |
| 229 | @ <li> |
| 230 | if( g.perm.History && g.perm.Read ){ |
| 231 | @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> |
| 232 | @ %h(zFile)</a> |
| 233 | }else{ |
| 234 | @ %h(zFile) |
| 235 | } |
| 236 | @ added by %h(zUser) on |
| 237 | hyperlink_to_date(zDate, "."); |
| 238 | if( g.perm.WrWiki && g.perm.Attach ){ |
| 239 | @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] |
| 240 |