TT#172650 update dtls_signature field to enum

Change-Id: I83bb566131b4fc6d00a6323ccd9b105bb01fd53f
pull/1487/head
Richard Fuchs 4 years ago
parent af948b498a
commit 008c4c7dce

@ -261,7 +261,7 @@ static int cert_init(void) {
/* sign it */ /* sign it */
if (!X509_sign(x509, pkey, rtpe_config.dtls_signature == 1 ? EVP_sha1() : EVP_sha256())) if (!X509_sign(x509, pkey, rtpe_config.dtls_signature == DSIG_SHA1 ? EVP_sha1() : EVP_sha256()))
goto err; goto err;
/* digest */ /* digest */

@ -89,7 +89,6 @@ struct rtpengine_config rtpe_config = {
.media_num_threads = -1, .media_num_threads = -1,
.dtls_rsa_key_size = 2048, .dtls_rsa_key_size = 2048,
.dtls_mtu = 1200, // chrome default mtu .dtls_mtu = 1200, // chrome default mtu
.dtls_signature = 256,
.max_dtx = 30, .max_dtx = 30,
.dtx_shift = 5, .dtx_shift = 5,
.dtx_buffer = 10, .dtx_buffer = 10,
@ -791,13 +790,13 @@ static void options(int *argc, char ***argv) {
if (dtls_sig) { if (dtls_sig) {
if (!strcasecmp(dtls_sig, "sha-1")) if (!strcasecmp(dtls_sig, "sha-1"))
rtpe_config.dtls_signature = 1; rtpe_config.dtls_signature = DSIG_SHA1;
else if (!strcasecmp(dtls_sig, "sha1")) else if (!strcasecmp(dtls_sig, "sha1"))
rtpe_config.dtls_signature = 1; rtpe_config.dtls_signature = DSIG_SHA1;
else if (!strcasecmp(dtls_sig, "sha-256")) else if (!strcasecmp(dtls_sig, "sha-256"))
rtpe_config.dtls_signature = 256; rtpe_config.dtls_signature = DSIG_SHA256;
else if (!strcasecmp(dtls_sig, "sha256")) else if (!strcasecmp(dtls_sig, "sha256"))
rtpe_config.dtls_signature = 256; rtpe_config.dtls_signature = DSIG_SHA256;
else else
die("Invalid --dtls-signature option ('%s')", dtls_sig); die("Invalid --dtls-signature option ('%s')", dtls_sig);
} }

@ -108,7 +108,10 @@ struct rtpengine_config {
int dtls_rsa_key_size; int dtls_rsa_key_size;
int dtls_mtu; int dtls_mtu;
char *dtls_ciphers; char *dtls_ciphers;
int dtls_signature; enum {
DSIG_SHA256 = 0,
DSIG_SHA1,
} dtls_signature;
char **http_ifs; char **http_ifs;
char **https_ifs; char **https_ifs;
char *https_cert; char *https_cert;

Loading…
Cancel
Save