diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-01-21 23:13:13 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-01-21 23:13:13 +0900 |
| commit | aaab5bbc746b22961ffb43e081164fce65ca5dec (patch) | |
| tree | 53cb86e299b395dc6e8cc8eca4e2693efdede47f /src | |
| parent | 9acd322db87a9a6933a8bce04427b3dbd71e19b5 (diff) | |
Improve error message when loading pkcs12 file failed
Diffstat (limited to 'src')
| -rw-r--r-- | src/LibgnutlsTLSContext.cc | 13 | ||||
| -rw-r--r-- | src/LibsslTLSContext.cc | 32 |
2 files changed, 34 insertions, 11 deletions
diff --git a/src/LibgnutlsTLSContext.cc b/src/LibgnutlsTLSContext.cc index 8577d1c3..7a6cc98c 100644 --- a/src/LibgnutlsTLSContext.cc +++ b/src/LibgnutlsTLSContext.cc @@ -111,9 +111,16 @@ bool GnuTLSContext::addP12CredentialFile(const std::string& p12file) int err = gnutls_certificate_set_x509_simple_pkcs12_mem( certCred_, &data, GNUTLS_X509_FMT_DER, ""); if (err != GNUTLS_E_SUCCESS) { - A2_LOG_ERROR("Failed to import PKCS12 file. " - "If you meant to use PEM, you'll also have to specify " - "--rpc-private-key. See the manual."); + if (side_ == TLS_SERVER) { + A2_LOG_ERROR("Failed to import PKCS12 file. " + "If you meant to use PEM, you'll also have to specify " + "--rpc-private-key. See the manual."); + } + else { + A2_LOG_ERROR("Failed to import PKCS12 file. " + "If you meant to use PEM, you'll also have to specify " + "--private-key. See the manual."); + } return false; } return true; diff --git a/src/LibsslTLSContext.cc b/src/LibsslTLSContext.cc index 675d77a6..fb74ccc6 100644 --- a/src/LibsslTLSContext.cc +++ b/src/LibsslTLSContext.cc @@ -203,20 +203,36 @@ bool OpenSSLTLSContext::addP12CredentialFile(const std::string& p12file) } p12_t p12(d2i_PKCS12_bio(bio.get(), nullptr)); if (!p12) { - A2_LOG_ERROR(fmt("Failed to open PKCS12 file: %s. " - "If you meant to use PEM, you'll also have to specify " - "--rpc-private-key. See the manual.", - ERR_error_string(ERR_get_error(), nullptr))); + if (side_ == TLS_SERVER) { + A2_LOG_ERROR(fmt("Failed to open PKCS12 file: %s. " + "If you meant to use PEM, you'll also have to specify " + "--rpc-private-key. See the manual.", + ERR_error_string(ERR_get_error(), nullptr))); + } + else { + A2_LOG_ERROR(fmt("Failed to open PKCS12 file: %s. " + "If you meant to use PEM, you'll also have to specify " + "--private-key. See the manual.", + ERR_error_string(ERR_get_error(), nullptr))); + } return false; } EVP_PKEY* pkey; X509* cert; STACK_OF(X509)* ca = nullptr; if (!PKCS12_parse(p12.get(), "", &pkey, &cert, &ca)) { - A2_LOG_ERROR(fmt("Failed to parse PKCS12 file: %s. " - "If you meant to use PEM, you'll also have to specify " - "--rpc-private-key. See the manual.", - ERR_error_string(ERR_get_error(), nullptr))); + if (side_ == TLS_SERVER) { + A2_LOG_ERROR(fmt("Failed to parse PKCS12 file: %s. " + "If you meant to use PEM, you'll also have to specify " + "--rpc-private-key. See the manual.", + ERR_error_string(ERR_get_error(), nullptr))); + } + else { + A2_LOG_ERROR(fmt("Failed to parse PKCS12 file: %s. " + "If you meant to use PEM, you'll also have to specify " + "--private-key. See the manual.", + ERR_error_string(ERR_get_error(), nullptr))); + } return false; } |