![changeset 5192 [home]](/images/logo.png?1180520111 "Home"){kind=logo}
Changeset 5192
Removed the static paths to the ssl certificates
Committed by:
wildzero-cw
Date:
Aug 17 2008 * 23:29 (4 months ago)
Affected files:
callweaver/branches/srtp_tls/channels/chan_sip.c (diff)- callweaver/branches/srtp_tls/configs/sip.conf.sample (diff)
callweaver/branches/srtp_tls/channels/chan_sip.c (unified diff)
| r5176 | r5192 | |
|---|---|---|
| 20 | 20 | * \file |
| 21 | 21 | * \brief Implementation of Session Initiation Protocol |
| 22 | 22 | * |
| 23 | * Implementation of RFC 3261 - without S/MIME, TCP and TLS support | |
| 23 | * Implementation of RFC 3261 - without S/MIME | |
| 24 | * TCP and TLS support is in progress | |
| 25 | * | |
| 24 | 26 | * Configuration file \link Config_sip sip.conf \endlink |
| 25 | 27 | * |
| 26 | * \todo SIP over TCP | |
| 27 | * \todo SIP over TLS | |
| 28 | * \todo SIP over TCP -> in progress | |
| 29 | * \todo SIP over TLS -> in progress | |
| 30 | * | |
| 28 | 31 | * \todo Better support of forking |
| 29 | 32 | */ |
| 30 | 33 | #ifdef HAVE_CONFIG_H |
| --- | --- | |
| 498 | 501 | |
| 499 | 502 | #ifdef SIP_TCP_SUPPORT |
| 500 | 503 | #define MAX_PATH_LEN 100 |
| 501 | #define DEFAULT_SIP_TLS_PORT 5061 /* From RFC 3261 */ | |
| 502 | #define DEFAULT_PASSWORD "callweaver" | |
| 504 | #define DEFAULT_SIP_TLS_PORT 5061 /* From RFC 3261 */ | |
| 503 | 505 | #define DEFAULT_ENTROPY "/dev/urandom" |
| 504 | #define DEFAULT_TRUSTCERTS "/var/lib/callweaver/keys/trustcerts.pem" | |
| 505 | #define DEFAULT_TRUSTCERTSDIR "/var/lib/callweaver/keys/trustdir" | |
| 506 | #define DEFAULT_SERVERCERT "/var/lib/callweaver/keys/servercert.pem" | |
| 507 | #define DEFAULT_SERVEREKEY "/var/lib/callweaver/keys/serverkey.pem" | |
| 508 | #define DEFAULT_DH512 "/var/lib/callweaver/keys/dh512.pem" | |
| 509 | #define DEFAULT_DH1024 "/var/lib/callweaver/keys/dh1024.pem" | |
| 510 | #define CIPHER_LIST "ALL" | |
| 506 | #define CIPHER_LIST "ALL" | |
| 507 | */ #define DEFAULT_TRUSTCERTSDIR "/usr/share/callweaver/keys/trustdir" */ | |
| 511 | 508 | |
| 512 | static char trustcerts_file[MAX_PATH_LEN] = DEFAULT_TRUSTCERTS; | |
| 513 | static char servercert_file[MAX_PATH_LEN] = DEFAULT_SERVERCERT; | |
| 514 | static char serverkey_file[MAX_PATH_LEN] = DEFAULT_SERVEREKEY; | |
| 515 | static char serverkey_password[MAX_PATH_LEN] = DEFAULT_PASSWORD; | |
| 516 | static char dh512param_file[MAX_PATH_LEN] = DEFAULT_DH512; | |
| 517 | static char dh1024param_file[MAX_PATH_LEN] = DEFAULT_DH1024; | |
| 509 | static char trustcerts_file[MAX_PATH_LEN]; | |
| 510 | static char servercert_file[MAX_PATH_LEN]; | |
| 511 | static char serverkey_file[MAX_PATH_LEN]; | |
| 512 | static char serverkey_password[MAX_PATH_LEN]; | |
| 513 | static char dh512param_file[MAX_PATH_LEN]; | |
| 514 | static char dh1024param_file[MAX_PATH_LEN]; | |
| 518 | 515 | #endif |
| 519 | 516 | |
| 520 | 517 | static int usecnt =0; |
| --- | --- | |
| 17136 | 17133 | tos = 0; |
| 17137 | 17134 | expiry = DEFAULT_EXPIRY; |
| 17138 | 17135 | global_allowguest = 1; |
| 17136 | #ifdef SIP_TCP_SUPPORT | |
| 17137 | snprintf(trustcerts_file, sizeof(trustcerts_file),"%s/trustcerts.pem", cw_config_CW_KEY_DIR); | |
| 17138 | snprintf(servercert_file, sizeof(servercert_file),"%s/servercert.pem", cw_config_CW_KEY_DIR); | |
| 17139 | snprintf(serverkey_file, sizeof(serverkey_file),"%s/serverkey.pem", cw_config_CW_KEY_DIR); | |
| 17140 | snprintf(dh512param_file, sizeof(dh512param_file),"%s/dh512.pem", cw_config_CW_KEY_DIR); | |
| 17141 | snprintf(dh1024param_file, sizeof(dh1024param_file),"%s/dh1024.pem", cw_config_CW_KEY_DIR); | |
| 17142 | #endif | |
| 17139 | 17143 | |
| 17140 | 17144 | /* Copy the default jb config over global_jbconf */ |
| 17141 | 17145 | cw_jb_default_config(&global_jbconf); |
callweaver/branches/srtp_tls/configs/sip.conf.sample (unified diff)
| r4975 | r5192 | |
|---|---|---|
| 116 | 116 | ; unknown peers (i.e. unknown RTT) fail quickly you may want to give |
| 117 | 117 | ; up sooner. Note, though, that this would violate the standard. |
| 118 | 118 | |
| 119 | ;TLS certificates | |
| 120 | ;serverkeypassword=callweaver | |
| 121 | ;trustcerts=/usr/local/share/callweaver/keys//trustedcert.pem ; Trusted root CA or certificates files | |
| 122 | ;servercert=/usr/local/share/callweaver/keys/servercert.pem ; CallWeaver server certificate file | |
| 123 | ;serverkey=/usr/local/share/callweaver/keys/serverkey.pem ; CallWeaver server private key file | |
| 124 | :dh512param=/usr/local/share/callweaver/keys/dh512.pem ; ephemeral Diffe-Hellman parameter | |
| 125 | ;dh1024param=/usr/local/share/callweaver/keys/dh1024.pem ; ephemeral Diffe-Hellman parameter | |
| 126 | ||
| 119 | 127 | ; |
| 120 | 128 | ; If regcontext is specified, CallWeaver will dynamically create and destroy a |
| 121 | 129 | ; NoOp priority 1 extension for a given peer who registers or unregisters with |
RSS Feeds