summaryrefslogtreecommitdiffhomepage
path: root/libs/nixio/axTLS
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2009-06-06 20:34:33 +0000
committerSteven Barth <steven@midlink.org>2009-06-06 20:34:33 +0000
commit4d4f8f4d79577d0962e0b76db98d67865b69e6a0 (patch)
tree640c2d200202a3d2c94b6b48752ddb796470911d /libs/nixio/axTLS
parent4dbb045c981cdc07800592cda6363a348ab88612 (diff)
nixio: Fix axTLS configuration, prepare px5g integration
Diffstat (limited to 'libs/nixio/axTLS')
-rw-r--r--libs/nixio/axTLS/config/.config10
-rw-r--r--libs/nixio/axTLS/config/config.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/libs/nixio/axTLS/config/.config b/libs/nixio/axTLS/config/.config
index ccb745dfc5..46cd061b4d 100644
--- a/libs/nixio/axTLS/config/.config
+++ b/libs/nixio/axTLS/config/.config
@@ -30,16 +30,16 @@ CONFIG_SSL_FULL_MODE=y
# CONFIG_SSL_PROT_LOW is not set
CONFIG_SSL_PROT_MEDIUM=y
# CONFIG_SSL_PROT_HIGH is not set
-CONFIG_SSL_USE_DEFAULT_KEY=y
-CONFIG_SSL_PRIVATE_KEY_LOCATION=""
+# CONFIG_SSL_USE_DEFAULT_KEY is not set
+CONFIG_SSL_PRIVATE_KEY_LOCATION="/etc/nixio/rsa_main.der"
CONFIG_SSL_PRIVATE_KEY_PASSWORD=""
CONFIG_SSL_X509_CERT_LOCATION=""
-CONFIG_SSL_GENERATE_X509_CERT=y
+# CONFIG_SSL_GENERATE_X509_CERT is not set
CONFIG_SSL_X509_COMMON_NAME=""
CONFIG_SSL_X509_ORGANIZATION_NAME=""
CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME=""
-CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
-CONFIG_SSL_HAS_PEM=y
+# CONFIG_SSL_ENABLE_V23_HANDSHAKE is not set
+# CONFIG_SSL_HAS_PEM is not set
# CONFIG_SSL_USE_PKCS12 is not set
CONFIG_SSL_EXPIRY_TIME=24
CONFIG_X509_MAX_CA_CERTS=4
diff --git a/libs/nixio/axTLS/config/config.h b/libs/nixio/axTLS/config/config.h
index 61303c4852..0f861f34b3 100644
--- a/libs/nixio/axTLS/config/config.h
+++ b/libs/nixio/axTLS/config/config.h
@@ -31,16 +31,16 @@
#undef CONFIG_SSL_PROT_LOW
#define CONFIG_SSL_PROT_MEDIUM 1
#undef CONFIG_SSL_PROT_HIGH
-#define CONFIG_SSL_USE_DEFAULT_KEY 1
-#define CONFIG_SSL_PRIVATE_KEY_LOCATION ""
+#undef CONFIG_SSL_USE_DEFAULT_KEY
+#define CONFIG_SSL_PRIVATE_KEY_LOCATION "/etc/nixio/rsa_main.der"
#define CONFIG_SSL_PRIVATE_KEY_PASSWORD ""
#define CONFIG_SSL_X509_CERT_LOCATION ""
-#define CONFIG_SSL_GENERATE_X509_CERT 1
+#undef CONFIG_SSL_GENERATE_X509_CERT
#define CONFIG_SSL_X509_COMMON_NAME ""
#define CONFIG_SSL_X509_ORGANIZATION_NAME ""
#define CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME ""
-#define CONFIG_SSL_ENABLE_V23_HANDSHAKE 1
-#define CONFIG_SSL_HAS_PEM 1
+#undef CONFIG_SSL_ENABLE_V23_HANDSHAKE
+#undef CONFIG_SSL_HAS_PEM
#undef CONFIG_SSL_USE_PKCS12
#define CONFIG_SSL_EXPIRY_TIME 24
#define CONFIG_X509_MAX_CA_CERTS 4