Fossil SCM
Fix to the --ssl-identity issue described at [forum:/forumpost/6e2b2ee5316b7aef|forum post 6e2b2ee5316b7aef].
Commit
82b42943b191defacf4c4022a9e1ee22c9061a86d5608d559b563bc13ea510ea
Parent
f48e48f664de9bb…
1 file changed
+1
-1
+1
-1
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -143,11 +143,11 @@ | ||
| 143 | 143 | identityFile = g.zSSLIdentity; |
| 144 | 144 | }else{ |
| 145 | 145 | identityFile = db_get("ssl-identity", 0); |
| 146 | 146 | } |
| 147 | 147 | if( identityFile!=0 && identityFile[0]!='\0' ){ |
| 148 | - if( SSL_CTX_use_certificate_file(sslCtx,identityFile,SSL_FILETYPE_PEM)!=1 | |
| 148 | + if( SSL_CTX_use_certificate_chain_file(sslCtx,identityFile)!=1 | |
| 149 | 149 | || SSL_CTX_use_PrivateKey_file(sslCtx,identityFile,SSL_FILETYPE_PEM)!=1 |
| 150 | 150 | ){ |
| 151 | 151 | fossil_fatal("Could not load SSL identity from %s", identityFile); |
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -143,11 +143,11 @@ | |
| 143 | identityFile = g.zSSLIdentity; |
| 144 | }else{ |
| 145 | identityFile = db_get("ssl-identity", 0); |
| 146 | } |
| 147 | if( identityFile!=0 && identityFile[0]!='\0' ){ |
| 148 | if( SSL_CTX_use_certificate_file(sslCtx,identityFile,SSL_FILETYPE_PEM)!=1 |
| 149 | || SSL_CTX_use_PrivateKey_file(sslCtx,identityFile,SSL_FILETYPE_PEM)!=1 |
| 150 | ){ |
| 151 | fossil_fatal("Could not load SSL identity from %s", identityFile); |
| 152 | } |
| 153 | } |
| 154 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -143,11 +143,11 @@ | |
| 143 | identityFile = g.zSSLIdentity; |
| 144 | }else{ |
| 145 | identityFile = db_get("ssl-identity", 0); |
| 146 | } |
| 147 | if( identityFile!=0 && identityFile[0]!='\0' ){ |
| 148 | if( SSL_CTX_use_certificate_chain_file(sslCtx,identityFile)!=1 |
| 149 | || SSL_CTX_use_PrivateKey_file(sslCtx,identityFile,SSL_FILETYPE_PEM)!=1 |
| 150 | ){ |
| 151 | fossil_fatal("Could not load SSL identity from %s", identityFile); |
| 152 | } |
| 153 | } |
| 154 |