Skip to content

Commit

Permalink
Massive renaming of SSL variables/columns/etc to TLS.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ladar
ladar committed Jun 21, 2016
1 parent 3c8eb2d commit 1c071d9
Show file tree
Hide file tree
Showing 31 changed files with 223 additions and 219 deletions.
6 changes: 6 additions & 0 deletions .cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,12 @@
<configuration configurationName="Check">
<resource resourceType="PROJECT" workspacePath="/magma"/>
</configuration>
<configuration configurationName=".check">
<resource resourceType="PROJECT" workspacePath="/magma"/>
</configuration>
<configuration configurationName=".debug">
<resource resourceType="PROJECT" workspacePath="/magma"/>
</configuration>
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/magma"/>
</configuration>
Expand Down
5 changes: 0 additions & 5 deletions .project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
<project>magma.so</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<arguments>
Expand Down
56 changes: 28 additions & 28 deletions res/config/magma.config.stub
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#magma.smtp.bypass_addr =
#magma.smtp.bypass_addr =

magma.admin.contact = [email protected]
magma.admin.abuse = [email protected]
Expand All @@ -17,7 +17,7 @@ magma.log.time = false

magma.system.domain = example.com

magma.web.ssl_redirect = 127.0.0.1:10500
magma.web.tls_redirect = 127.0.0.1:10500
magma.web.statistics = true

magma.dkim.enabled = true
Expand Down Expand Up @@ -46,7 +46,7 @@ magma.iface.database.host = localhost
magma.iface.database.password = ${MYSQL_PASSWORD}
magma.iface.database.pool.connections = 6
magma.iface.database.schema = ${MYSQL_SCHEMA}
#magma.iface.database.socket_path =
#magma.iface.database.socket_path =
magma.iface.database.user = ${MYSQL_USER}


Expand All @@ -64,7 +64,7 @@ magma.web.portal.safeguard = false

magma.relay.timeout = 60
magma.relay[1].name = localhost
magma.relay[1].port = 7000
magma.relay[1].port = 2525

magma.servers[1].name = Lavabit Molten
magma.servers[1].domain = example.com
Expand All @@ -81,111 +81,111 @@ magma.servers[3].name = Lavabit SMTP
magma.servers[3].domain = example.com
magma.servers[3].protocol = SMTP
magma.servers[3].network.port = 7000
magma.servers[3].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[3].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[4].name = Lavabit SMTP
magma.servers[4].domain = example.com
magma.servers[4].protocol = SMTP
magma.servers[4].network.port = 7050
magma.servers[4].network.ipv6 = true
magma.servers[4].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[4].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[5].name = Lavabit SMTPS
magma.servers[5].domain = example.com
magma.servers[5].protocol = SMTP
magma.servers[5].network.port = 7500
magma.servers[5].network.type = SSL
magma.servers[5].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[5].network.type = TLS
magma.servers[5].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[6].name = Lavabit SMTPS
magma.servers[6].domain = example.com
magma.servers[6].protocol = SMTP
magma.servers[6].network.port = 7550
magma.servers[6].network.ipv6 = true
magma.servers[6].network.type = SSL
magma.servers[6].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[6].network.type = TLS
magma.servers[6].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[7].name = Lavabit POP
magma.servers[7].domain = example.com
magma.servers[7].protocol = POP
magma.servers[7].network.port = 8000
magma.servers[7].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[7].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[8].name = Lavabit POP
magma.servers[8].domain = example.com
magma.servers[8].protocol = POP
magma.servers[8].network.port = 8050
magma.servers[8].network.ipv6 = true
magma.servers[8].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[8].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[9].name = Lavabit POPS
magma.servers[9].domain = example.com
magma.servers[9].protocol = POP
magma.servers[9].network.port = 8500
magma.servers[9].network.type = SSL
magma.servers[9].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[9].network.type = TLS
magma.servers[9].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[10].name = Lavabit POPS
magma.servers[10].domain = example.com
magma.servers[10].protocol = POP
magma.servers[10].network.port = 8550
magma.servers[10].network.ipv6 = true
magma.servers[10].network.type = SSL
magma.servers[10].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[10].network.type = TLS
magma.servers[10].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[11].name = Lavabit IMAP
magma.servers[11].domain = example.com
magma.servers[11].protocol = IMAP
magma.servers[11].network.port = 9000
magma.servers[11].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[11].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[12].name = Lavabit IMAP
magma.servers[12].domain = example.com
magma.servers[12].protocol = IMAP
magma.servers[12].network.port = 9050
magma.servers[12].network.ipv6 = true
magma.servers[12].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[12].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[13].name = Lavabit IMAPS
magma.servers[13].domain = example.com
magma.servers[13].protocol = IMAP
magma.servers[13].network.port = 9500
magma.servers[13].network.type = SSL
magma.servers[13].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[13].network.type = TLS
magma.servers[13].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[14].name = Lavabit IMAPS
magma.servers[14].domain = example.com
magma.servers[14].protocol = IMAP
magma.servers[14].network.port = 9550
magma.servers[14].network.ipv6 = true
magma.servers[14].network.type = SSL
magma.servers[14].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[14].network.type = TLS
magma.servers[14].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[15].name = Lavabit HTTP
magma.servers[15].domain = example.com
magma.servers[15].protocol = HTTP
magma.servers[15].network.port = 10000
magma.servers[15].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[15].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[16].name = Lavabit HTTP
magma.servers[16].domain = example.com
magma.servers[16].protocol = HTTP
magma.servers[16].network.port = 10050
magma.servers[16].network.ipv6 = true
magma.servers[16].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[16].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[17].name = Lavabit HTTPS
magma.servers[17].domain = example.com
magma.servers[17].protocol = HTTP
magma.servers[17].network.port = 10500
magma.servers[17].network.type = SSL
magma.servers[17].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[17].network.type = TLS
magma.servers[17].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

magma.servers[18].name = Lavabit HTTPS
magma.servers[18].domain = example.com
magma.servers[18].protocol = HTTP
magma.servers[18].network.port = 10550
magma.servers[18].network.ipv6 = true
magma.servers[18].network.type = SSL
magma.servers[18].ssl.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem
magma.servers[18].network.type = TLS
magma.servers[18].tls.certificate = ${BASE_DIR}/res/config/localhost.localdomain.pem

5 changes: 4 additions & 1 deletion res/sql/Migration.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ ALTER TABLE `Folders` ADD COLUMN `type` INT(10) UNSIGNED NOT NULL DEFAULT 1 AFTE
ALTER TABLE `Folders` DROP INDEX `UNIQ_FOLDERNAME`, ADD UNIQUE INDEX `UNIQ_FOLDERNAME` (`usernum`, `type`, `parent`, `foldername`) ;

/* Alter the Users table for STACIE support. Deprecate any existing legacy passwords. */
/* ALTER TABLE `Lavabit`.`Users` CHANGE COLUMN `password` `legacy` VARCHAR(130) NULL DEFAULT NULL ; */
/* ALTER TABLE `Lavabit`.`Users` CHANGE COLUMN `password` `legacy` VARCHAR(130) NULL DEFAULT NULL; */

ALTER TABLE `Lavabit`.`Users` CHANGE COLUMN `ssl` `tls` tinyint(1) NOT NULL DEFAULT '0';
ALTER TABLE `Lavabit`.`Limits` CHANGE COLUMN `ssl` `tls` tinyint(1) NOT NULL DEFAULT '1';
58 changes: 29 additions & 29 deletions sandbox/etc/magma.sandbox.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ magma.log.time = false

magma.system.domain = lavabit.com

magma.web.ssl_redirect = 127.0.0.1:10500
magma.web.tls_redirect = 127.0.0.1:10500
magma.web.statistics = true

magma.dkim.enabled = true
Expand Down Expand Up @@ -87,126 +87,126 @@ magma.servers[3].name = Lavabit SMTP
magma.servers[3].domain = lavabit.com
magma.servers[3].protocol = SMTP
magma.servers[3].network.port = 7000
magma.servers[3].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[3].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[4].name = Lavabit SMTP
magma.servers[4].domain = lavabit.com
magma.servers[4].protocol = SMTP
magma.servers[4].network.port = 7050
magma.servers[4].network.ipv6 = true
magma.servers[4].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[4].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[5].name = Lavabit SMTPS
magma.servers[5].domain = lavabit.com
magma.servers[5].protocol = SMTP
magma.servers[5].network.port = 7500
magma.servers[5].network.type = SSL
magma.servers[5].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[5].network.type = TLS
magma.servers[5].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[6].name = Lavabit DMTP
magma.servers[6].domain = lavabit.com
magma.servers[6].protocol = DMTP
magma.servers[6].network.port = 7501
magma.servers[6].network.type = SSL
magma.servers[6].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[6].network.type = TLS
magma.servers[6].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[7].name = Lavabit SMTPS v6
magma.servers[7].domain = lavabit.com
magma.servers[7].protocol = SMTP
magma.servers[7].network.port = 7550
magma.servers[7].network.type = SSL
magma.servers[7].network.type = TLS
magma.servers[7].network.ipv6 = true
magma.servers[7].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[7].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[8].name = Lavabit DMTP v6
magma.servers[8].domain = lavabit.com
magma.servers[8].protocol = DMTP
magma.servers[8].network.port = 7551
magma.servers[8].network.type = SSL
magma.servers[8].network.type = TLS
magma.servers[8].network.ipv6 = true
magma.servers[8].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[8].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[9].name = Lavabit POP
magma.servers[9].domain = lavabit.com
magma.servers[9].protocol = POP
magma.servers[9].network.port = 8000
magma.servers[9].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[9].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[10].name = Lavabit POP
magma.servers[10].domain = lavabit.com
magma.servers[10].protocol = POP
magma.servers[10].network.port = 8050
magma.servers[10].network.ipv6 = true
magma.servers[10].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[10].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[11].name = Lavabit POPS
magma.servers[11].domain = lavabit.com
magma.servers[11].protocol = POP
magma.servers[11].network.port = 8500
magma.servers[11].network.type = SSL
magma.servers[11].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[11].network.type = TLS
magma.servers[11].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[12].name = Lavabit POPS
magma.servers[12].domain = lavabit.com
magma.servers[12].protocol = POP
magma.servers[12].network.port = 8550
magma.servers[12].network.ipv6 = true
magma.servers[12].network.type = SSL
magma.servers[12].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[12].network.type = TLS
magma.servers[12].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[13].name = Lavabit IMAP
magma.servers[13].domain = lavabit.com
magma.servers[13].protocol = IMAP
magma.servers[13].network.port = 9000
magma.servers[13].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[13].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[14].name = Lavabit IMAP
magma.servers[14].domain = lavabit.com
magma.servers[14].protocol = IMAP
magma.servers[14].network.port = 9050
magma.servers[14].network.ipv6 = true
magma.servers[14].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[14].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[15].name = Lavabit IMAPS
magma.servers[15].domain = lavabit.com
magma.servers[15].protocol = IMAP
magma.servers[15].network.port = 9500
magma.servers[15].network.type = SSL
magma.servers[15].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[15].network.type = TLS
magma.servers[15].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[16].name = Lavabit IMAPS
magma.servers[16].domain = lavabit.com
magma.servers[16].protocol = IMAP
magma.servers[16].network.port = 9550
magma.servers[16].network.ipv6 = true
magma.servers[16].network.type = SSL
magma.servers[16].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[16].network.type = TLS
magma.servers[16].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[17].name = Lavabit HTTP
magma.servers[17].domain = lavabit.com
magma.servers[17].protocol = HTTP
magma.servers[17].network.port = 10000
magma.servers[17].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[17].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[18].name = Lavabit HTTP
magma.servers[18].domain = lavabit.com
magma.servers[18].protocol = HTTP
magma.servers[18].network.port = 10050
magma.servers[18].network.ipv6 = true
magma.servers[18].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[18].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[19].name = Lavabit HTTPS
magma.servers[19].domain = lavabit.com
magma.servers[19].protocol = HTTP
magma.servers[19].network.port = 10500
magma.servers[19].network.type = SSL
magma.servers[19].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[19].network.type = TLS
magma.servers[19].tls.certificate = sandbox/etc/localhost.localdomain.pem

magma.servers[20].name = Lavabit HTTPS
magma.servers[20].domain = lavabit.com
magma.servers[20].protocol = HTTP
magma.servers[20].network.port = 10550
magma.servers[20].network.ipv6 = true
magma.servers[20].network.type = SSL
magma.servers[20].ssl.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[20].network.type = TLS
magma.servers[20].tls.certificate = sandbox/etc/localhost.localdomain.pem
magma.servers[20].enabled = false
7 changes: 4 additions & 3 deletions src/engine/config/global/global.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void config_output_value_generic(chr_t *prefix, chr_t *name, M_TYPE type, void *
if (*((M_PORT *)((char *)val)) == TCP_PORT)
log_info("%s%s%s = TCP", prefix, name, reqstr);
else if (*((M_PORT *)((char *)val)) == TLS_PORT)
log_info("%s%s%s = SSL", prefix, name, reqstr);
log_info("%s%s%s = TLS", prefix, name, reqstr);
else
log_info("%s%s%s = [UNKNOWN]", prefix, name, reqstr);
}
Expand Down Expand Up @@ -355,7 +355,8 @@ bool_t config_validate_settings(void) {
if (magma.iface.virus.available && !magma.iface.virus.signatures) {
log_critical("magma.iface.virus.signatures is required and must be set when the virus scanner is enabled.");
result = false;
} else {
}
else {
CONFIG_CHECK_DIR_READABLE(magma.iface.virus.signatures);
}

Expand Down Expand Up @@ -447,7 +448,7 @@ bool_t config_validate_settings(void) {
result = false;
}

// The rest has to be executed after the openssl library is loaded.
// The rest has to be executed after the OpenSSL library is loaded.

}

Expand Down
Loading

0 comments on commit 1c071d9

Please sign in to comment.