diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 17:51:09 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 17:51:09 +0200 |
| commit | 7c92dc31f2ed158619b094e71e30dbaa487fcb40 (patch) | |
| tree | d4c542f51b5155eb3f3627c628686cfc0d648a2f /netwerk | |
| parent | 57c070bf4d6fe704672efd89c6a35b42e5c38e9e (diff) | |
| parent | c87083af1cb025c3084bee220813e4a14bb637db (diff) | |
| download | uxp-7c92dc31f2ed158619b094e71e30dbaa487fcb40.tar.gz | |
Merge branch 'ported-upstream'
Diffstat (limited to 'netwerk')
| -rwxr-xr-x | netwerk/sctp/src/netinet/sctp_auth.c | 2 | ||||
| -rwxr-xr-x | netwerk/sctp/src/netinet/sctp_pcb.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/netwerk/sctp/src/netinet/sctp_auth.c b/netwerk/sctp/src/netinet/sctp_auth.c index 50432ad8a5..ee5ca36ce3 100755 --- a/netwerk/sctp/src/netinet/sctp_auth.c +++ b/netwerk/sctp/src/netinet/sctp_auth.c @@ -1525,6 +1525,8 @@ sctp_auth_get_cookie_params(struct sctp_tcb *stcb, struct mbuf *m, if (p_random != NULL) { keylen = sizeof(*p_random) + random_len; bcopy(p_random, new_key->key, keylen); + } else { + keylen = 0; } /* append in the AUTH chunks */ if (chunks != NULL) { diff --git a/netwerk/sctp/src/netinet/sctp_pcb.c b/netwerk/sctp/src/netinet/sctp_pcb.c index 2970970250..58c164f503 100755 --- a/netwerk/sctp/src/netinet/sctp_pcb.c +++ b/netwerk/sctp/src/netinet/sctp_pcb.c @@ -7688,6 +7688,8 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m, if (p_random != NULL) { keylen = sizeof(*p_random) + random_len; bcopy(p_random, new_key->key, keylen); + } else { + keylen = 0; } /* append in the AUTH chunks */ if (chunks != NULL) { |