Merge branch 'develop' into release/1.2.0

This commit is contained in:
Наиля Алашкова 2024-12-10 10:04:03 +03:00
commit 0a3f5eef66
3 changed files with 16 additions and 2 deletions

View file

@ -10,8 +10,7 @@ fi
set +e set +e
cd /home/ervu/cacerts cd /home/ervu/cacerts
echo o | /opt/cprocsp/bin/amd64/certmgr -install -store uRoot -file testgost2012_10.crt echo o | /opt/cprocsp/bin/amd64/certmgr -install -store uRoot -file test_ca_2014.crt
echo o | /opt/cprocsp/bin/amd64/certmgr -install -store uRoot -thumbprint 67aea9fc8041cfafafbb77c4837038f05e727501 -file testroot.p7b
set -e set -e
/opt/ervu-sign-module/ervu-sign-module /opt/ervu-sign-module/ervu-sign-module

View file

@ -78,6 +78,16 @@ sign_conf_load(sign_conf_t *conf, const conf_file_context_t conf_file)
goto error; goto error;
} }
if (str_t_is_null(conf->sign_cert_thumbprint)) {
LOG_ERROR(SIGN_CONF_SECTION ":" SIGN_CONF_KEY_SIGN_CERT_THUMBPRINT " is required");
goto error;
}
if (str_t_is_null(conf->sign_cert_password)) {
LOG_ERROR(SIGN_CONF_SECTION ":" SIGN_CONF_KEY_SIGN_CERT_PASSWORD " is required");
goto error;
}
LOG_TRACE("sign_conf_load exit"); LOG_TRACE("sign_conf_load exit");
return 0; return 0;

View file

@ -74,6 +74,11 @@ verify_conf_load(verify_conf_t *conf, const conf_file_context_t conf_file)
goto error; goto error;
} }
if (conf->esia_cert_thumbprint_list.size == 0) {
LOG_ERROR(VERIFY_CONF_SECTION ":" VERIFY_CONF_KEY_THUMBPRINT " is required");
goto error;
}
LOG_TRACE("verify_conf_load exit"); LOG_TRACE("verify_conf_load exit");
return 0; return 0;