GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-14 02:22:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Anyconnect client compatibility is optional.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-03-02 15:35:16 +01:00
parent 9900ff6060
commit 62392660cd
9 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.c
+10 -3
View File
@@ -147,7 +147,9 @@ unsigned j;
READ_STRING("server-key", config->key, 1);
READ_STRING("pin-file", config->pin_file, 0);
READ_STRING("srk-pin-file", config->srk_pin_file, 0);
#ifdef ANYCONNECT_CLIENT_COMPAT
READ_STRING("user-profile", config->xml_config_file, 0);
#endif
READ_STRING("ca-cert", config->ca, 0);
READ_STRING("crl", config->crl, 0);
@@ -235,9 +237,6 @@ static void check_cfg( struct cfg_st *config)
exit(1);
}
if (config->cert) {
config->cert_hash = calc_sha1_hash(config->cert, 1);
}
if (config->auth_types & AUTH_TYPE_CERTIFICATE) {
if (config->force_cert_auth)
@@ -246,6 +245,11 @@ static void check_cfg( struct cfg_st *config)
config->cert_req = GNUTLS_CERT_REQUEST;
}
#ifdef ANYCONNECT_CLIENT_COMPAT
if (config->cert) {
config->cert_hash = calc_sha1_hash(config->cert, 1);
}
if (config->xml_config_file) {
config->xml_config_hash = calc_sha1_hash(config->xml_config_file, 0);
if (config->xml_config_hash == NULL && config->chroot_dir != NULL) {
@@ -264,6 +268,7 @@ static void check_cfg( struct cfg_st *config)
exit(1);
}
}
#endif
if (config->keepalive == 0)
config->keepalive = 3600;
@@ -314,9 +319,11 @@ void reload_cfg_file(struct cfg_st* config)
{
unsigned i;
#ifdef ANYCONNECT_CLIENT_COMPAT
DEL(config->xml_config_file);
DEL(config->xml_config_hash);
DEL(config->cert_hash);
#endif
DEL(config->banner);
DEL(config->name);
DEL(config->cert);