Browse Source

TT#172650 update dtls_signature field to enum

Change-Id: I83bb566131b4fc6d00a6323ccd9b105bb01fd53f
pull/1487/head
Richard Fuchs 4 years ago
parent
commit
008c4c7dce
3 changed files with 9 additions and 7 deletions
  1. +1
    -1
      daemon/dtls.c
  2. +4
    -5
      daemon/main.c
  3. +4
    -1
      include/main.h

+ 1
- 1
daemon/dtls.c View File

@ -261,7 +261,7 @@ static int cert_init(void) {
/* 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;
/* digest */


+ 4
- 5
daemon/main.c View File

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


+ 4
- 1
include/main.h View File

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


Loading…
Cancel
Save