aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gnutls_config.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gnutls_config.c b/src/gnutls_config.c
index 0a56b38..3ff3b34 100644
--- a/src/gnutls_config.c
+++ b/src/gnutls_config.c
@@ -194,7 +194,12 @@ const char *mgs_set_key_file(cmd_parms * parms, void *dummy,
194 ret = 194 ret =
195 gnutls_x509_privkey_import(sc->privkey_x509, &data, 195 gnutls_x509_privkey_import(sc->privkey_x509, &data,
196 GNUTLS_X509_FMT_PEM); 196 GNUTLS_X509_FMT_PEM);
197 if (ret != 0) { 197
198 if (ret < 0)
199 ret = gnutls_x509_privkey_import_pkcs8 (sc->privkey_x509, &data, GNUTLS_X509_FMT_PEM,
200 NULL, GNUTLS_PKCS_PLAIN);
201
202 if (ret < 0) {
198 return apr_psprintf(parms->pool, "GnuTLS: Failed to Import " 203 return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
199 "Private Key '%s': (%d) %s", file, ret, 204 "Private Key '%s': (%d) %s", file, ret,
200 gnutls_strerror(ret)); 205 gnutls_strerror(ret));
cc416d6b177c94266da98104cc29661e608'>apr_table_setn doesn't copy the data. oops.Gravatar Paul Querna 2005-04-24 * We already have a Certificate, use it directly. With SNI, GnuTLS doesn't pro...Gravatar Paul Querna 2005-04-24 * if there aren't any certs.. still set something.Gravatar Paul Querna 2005-04-24 * add SSL_SERVER_S_DN and SSL_SERVER_I_DN Gravatar Paul Querna 2005-04-24 * - move hooks to gnutls_hooks.cGravatar Paul Querna 2005-04-24 * move config functions to their own file. Gravatar Paul Querna 2005-04-24 * - remove more debug logging.Gravatar Paul Querna 2005-04-22 * client auth is sort of working.Gravatar Paul Querna 2005-04-22 * working SNI. Not so working Client Cert support.Gravatar Paul Querna 2005-04-21 * move back to the trunk for m4 filesGravatar Paul Querna 2005-04-08 * prep for 0.1.1 release.0.1.1Gravatar Paul Querna 2005-04-08 * include support for 2.0.xxGravatar Paul Querna 2005-04-08 * wrap the debug log in maintainer mode.Gravatar Paul Querna 2005-04-08 * roll on past 0.1.0Gravatar Paul Querna 2005-04-06 * update ignoresGravatar Paul Querna 2005-04-06 * switch to a tagged version of the m4 files.Gravatar Paul Querna 2005-04-06 * fix the indent.Gravatar Paul Querna 2005-04-06 * fixes for pre-0.1.0Gravatar Paul Querna 2005-04-06 * working on a release.. really!Gravatar Paul Querna 2005-04-06 * - remove anno credsGravatar Paul Querna 2005-04-06 * checkpoint the work so far. The DBM cache needs a little more work.Gravatar Paul Querna 2005-04-05 * - make memcahe optionalGravatar Paul Querna 2005-04-04 * make this a generated fileGravatar Paul Querna 2005-04-04 * updated header.Gravatar Paul Querna 2005-04-04 * use apr to parse hostnames..Gravatar Paul Querna 2004-12-12 * working support for a ssl session cache via memcached.Gravatar Paul Querna 2004-12-10 * add check for apr_memcacheGravatar Paul Querna 2004-12-09 * fixes and stuff that i should of already committed.