From: Art Cancro Date: Fri, 1 May 2015 20:35:01 +0000 (-0400) Subject: migrated serv_crypto.c to new config format X-Git-Tag: Release_902~167^2~17 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2e31ba34c6f956b7a4d915910af7a931e1bc62a1 migrated serv_crypto.c to new config format --- diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c index a9761a549..cb12d3185 100644 --- a/citadel/modules/crypto/serv_crypto.c +++ b/citadel/modules/crypto/serv_crypto.c @@ -1,19 +1,13 @@ /* - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2015 by the citadel.org team * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3. - * - * + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * - * - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include @@ -260,7 +254,7 @@ void init_ssl(void) X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, - (unsigned char*) config.c_humannode, + (unsigned char*) CtdlGetConfigStr("c_humannode"), -1, -1, 0); X509_NAME_add_entry_by_txt(name, "OU", @@ -269,7 +263,7 @@ void init_ssl(void) -1, -1, 0); /* X509_NAME_add_entry_by_txt(name, "CN", - MBSTRING_ASC, config.c_fqdn, -1, -1, 0); + MBSTRING_ASC, CtdlGetConfigStr("c_fqdn"), -1, -1, 0); */ X509_NAME_add_entry_by_txt(name,