Skip to content

Commit

Permalink
Revert "Replace non-portable strcasestr() with strncasecmp() (meetech…
Browse files Browse the repository at this point in the history
…o#3076)"

This reverts commit 78da5c5.
  • Loading branch information
croudet committed Oct 21, 2022
1 parent 11b5fa8 commit 9f5a3e3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/sdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ int janus_sdp_process_remote(void *ice_handle, janus_sdp *remote_sdp, gboolean r
if(a && a->name && a->value) {
if(!strcasecmp(a->name, "fingerprint")) {
JANUS_LOG(LOG_VERB, "[%"SCNu64"] Fingerprint (global) : %s\n", handle->handle_id, a->value);
if(!strncasecmp(a->value, "sha-256 ", strlen("sha-256 "))) {
if(strcasestr(a->value, "sha-256 ") == a->value) {
rhashing = g_strdup("sha-256");
rfingerprint = g_strdup(a->value + strlen("sha-256 "));
} else if(!strncasecmp(a->value, "sha-1 ", strlen("sha-1 "))) {
} else if(strcasestr(a->value, "sha-1 ") == a->value) {
JANUS_LOG(LOG_WARN, "[%"SCNu64"] Hashing algorithm not the one we expected (sha-1 instead of sha-256), but that's ok\n", handle->handle_id);
rhashing = g_strdup("sha-1");
rfingerprint = g_strdup(a->value + strlen("sha-1 "));
Expand Down Expand Up @@ -349,12 +349,12 @@ int janus_sdp_process_remote(void *ice_handle, janus_sdp *remote_sdp, gboolean r
}
} else if(!strcasecmp(a->name, "fingerprint")) {
JANUS_LOG(LOG_VERB, "[%"SCNu64"] Fingerprint (local) : %s\n", handle->handle_id, a->value);
if(!strncasecmp(a->value, "sha-256 ", strlen("sha-256 "))) {
if(strcasestr(a->value, "sha-256 ") == a->value) {
g_free(rhashing); /* FIXME We're overwriting the global one, if any */
rhashing = g_strdup("sha-256");
g_free(rfingerprint); /* FIXME We're overwriting the global one, if any */
rfingerprint = g_strdup(a->value + strlen("sha-256 "));
} else if(!strncasecmp(a->value, "sha-1 ", strlen("sha-1 "))) {
} else if(strcasestr(a->value, "sha-1 ") == a->value) {
JANUS_LOG(LOG_WARN, "[%"SCNu64"] Hashing algorithm not the one we expected (sha-1 instead of sha-256), but that's ok\n", handle->handle_id);
g_free(rhashing); /* FIXME We're overwriting the global one, if any */
rhashing = g_strdup("sha-1");
Expand Down

0 comments on commit 9f5a3e3

Please sign in to comment.