diff options
Diffstat (limited to 'src/lib/libcrypto/bio/bss_dgram.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bss_dgram.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c index 478c765399..e0445fc97e 100644 --- a/src/lib/libcrypto/bio/bss_dgram.c +++ b/src/lib/libcrypto/bio/bss_dgram.c | |||
| @@ -212,7 +212,7 @@ dgram_new(BIO *bi) | |||
| 212 | 212 | ||
| 213 | bi->init = 0; | 213 | bi->init = 0; |
| 214 | bi->num = 0; | 214 | bi->num = 0; |
| 215 | data = OPENSSL_malloc(sizeof(bio_dgram_data)); | 215 | data = malloc(sizeof(bio_dgram_data)); |
| 216 | if (data == NULL) | 216 | if (data == NULL) |
| 217 | return 0; | 217 | return 0; |
| 218 | memset(data, 0x00, sizeof(bio_dgram_data)); | 218 | memset(data, 0x00, sizeof(bio_dgram_data)); |
| @@ -234,7 +234,7 @@ dgram_free(BIO *a) | |||
| 234 | 234 | ||
| 235 | data = (bio_dgram_data *)a->ptr; | 235 | data = (bio_dgram_data *)a->ptr; |
| 236 | if (data != NULL) | 236 | if (data != NULL) |
| 237 | OPENSSL_free(data); | 237 | free(data); |
| 238 | 238 | ||
| 239 | return (1); | 239 | return (1); |
| 240 | } | 240 | } |
| @@ -805,7 +805,7 @@ BIO | |||
| 805 | * SCTP-AUTH has to be activated for the listening socket | 805 | * SCTP-AUTH has to be activated for the listening socket |
| 806 | * already, otherwise the connected socket won't use it. */ | 806 | * already, otherwise the connected socket won't use it. */ |
| 807 | sockopt_len = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t)); | 807 | sockopt_len = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t)); |
| 808 | authchunks = OPENSSL_malloc(sockopt_len); | 808 | authchunks = malloc(sockopt_len); |
| 809 | memset(authchunks, 0, sizeof(sockopt_len)); | 809 | memset(authchunks, 0, sizeof(sockopt_len)); |
| 810 | ret = getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks, &sockopt_len); | 810 | ret = getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks, &sockopt_len); |
| 811 | OPENSSL_assert(ret >= 0); | 811 | OPENSSL_assert(ret >= 0); |
| @@ -819,7 +819,7 @@ BIO | |||
| 819 | auth_forward = 1; | 819 | auth_forward = 1; |
| 820 | } | 820 | } |
| 821 | 821 | ||
| 822 | OPENSSL_free(authchunks); | 822 | free(authchunks); |
| 823 | 823 | ||
| 824 | OPENSSL_assert(auth_data); | 824 | OPENSSL_assert(auth_data); |
| 825 | OPENSSL_assert(auth_forward); | 825 | OPENSSL_assert(auth_forward); |
| @@ -866,7 +866,7 @@ dgram_sctp_new(BIO *bi) | |||
| 866 | 866 | ||
| 867 | bi->init = 0; | 867 | bi->init = 0; |
| 868 | bi->num = 0; | 868 | bi->num = 0; |
| 869 | data = OPENSSL_malloc(sizeof(bio_dgram_sctp_data)); | 869 | data = malloc(sizeof(bio_dgram_sctp_data)); |
| 870 | if (data == NULL) | 870 | if (data == NULL) |
| 871 | return 0; | 871 | return 0; |
| 872 | memset(data, 0x00, sizeof(bio_dgram_sctp_data)); | 872 | memset(data, 0x00, sizeof(bio_dgram_sctp_data)); |
| @@ -891,7 +891,7 @@ dgram_sctp_free(BIO *a) | |||
| 891 | 891 | ||
| 892 | data = (bio_dgram_sctp_data *)a->ptr; | 892 | data = (bio_dgram_sctp_data *)a->ptr; |
| 893 | if (data != NULL) | 893 | if (data != NULL) |
| 894 | OPENSSL_free(data); | 894 | free(data); |
| 895 | 895 | ||
| 896 | return (1); | 896 | return (1); |
| 897 | } | 897 | } |
| @@ -998,7 +998,7 @@ dgram_sctp_read(BIO *b, char *out, int outl) | |||
| 998 | if (data->saved_message.length > 0) { | 998 | if (data->saved_message.length > 0) { |
| 999 | dgram_sctp_write(data->saved_message.bio, data->saved_message.data, | 999 | dgram_sctp_write(data->saved_message.bio, data->saved_message.data, |
| 1000 | data->saved_message.length); | 1000 | data->saved_message.length); |
| 1001 | OPENSSL_free(data->saved_message.data); | 1001 | free(data->saved_message.data); |
| 1002 | data->saved_message.length = 0; | 1002 | data->saved_message.length = 0; |
| 1003 | } | 1003 | } |
| 1004 | 1004 | ||
| @@ -1087,7 +1087,7 @@ dgram_sctp_read(BIO *b, char *out, int outl) | |||
| 1087 | struct sctp_authchunks *authchunks; | 1087 | struct sctp_authchunks *authchunks; |
| 1088 | 1088 | ||
| 1089 | optlen = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t)); | 1089 | optlen = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t)); |
| 1090 | authchunks = OPENSSL_malloc(optlen); | 1090 | authchunks = malloc(optlen); |
| 1091 | memset(authchunks, 0, sizeof(optlen)); | 1091 | memset(authchunks, 0, sizeof(optlen)); |
| 1092 | ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS, authchunks, &optlen); | 1092 | ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS, authchunks, &optlen); |
| 1093 | OPENSSL_assert(ii >= 0); | 1093 | OPENSSL_assert(ii >= 0); |
| @@ -1101,7 +1101,7 @@ dgram_sctp_read(BIO *b, char *out, int outl) | |||
| 1101 | auth_forward = 1; | 1101 | auth_forward = 1; |
| 1102 | } | 1102 | } |
| 1103 | 1103 | ||
| 1104 | OPENSSL_free(authchunks); | 1104 | free(authchunks); |
| 1105 | 1105 | ||
| 1106 | if (!auth_data || !auth_forward) { | 1106 | if (!auth_data || !auth_forward) { |
| 1107 | BIOerr(BIO_F_DGRAM_SCTP_READ, BIO_R_CONNECT_ERROR); | 1107 | BIOerr(BIO_F_DGRAM_SCTP_READ, BIO_R_CONNECT_ERROR); |
| @@ -1154,7 +1154,7 @@ dgram_sctp_write(BIO *b, const char *in, int inl) | |||
| 1154 | if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) { | 1154 | if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) { |
| 1155 | data->saved_message.bio = b; | 1155 | data->saved_message.bio = b; |
| 1156 | data->saved_message.length = inl; | 1156 | data->saved_message.length = inl; |
| 1157 | data->saved_message.data = OPENSSL_malloc(inl); | 1157 | data->saved_message.data = malloc(inl); |
| 1158 | memcpy(data->saved_message.data, in, inl); | 1158 | memcpy(data->saved_message.data, in, inl); |
| 1159 | return inl; | 1159 | return inl; |
| 1160 | } | 1160 | } |
| @@ -1282,7 +1282,7 @@ dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 1282 | 1282 | ||
| 1283 | /* Add new key */ | 1283 | /* Add new key */ |
| 1284 | sockopt_len = sizeof(struct sctp_authkey) + 64 * sizeof(uint8_t); | 1284 | sockopt_len = sizeof(struct sctp_authkey) + 64 * sizeof(uint8_t); |
| 1285 | authkey = OPENSSL_malloc(sockopt_len); | 1285 | authkey = malloc(sockopt_len); |
| 1286 | memset(authkey, 0x00, sockopt_len); | 1286 | memset(authkey, 0x00, sockopt_len); |
| 1287 | authkey->sca_keynumber = authkeyid.scact_keynumber + 1; | 1287 | authkey->sca_keynumber = authkeyid.scact_keynumber + 1; |
| 1288 | #ifndef __FreeBSD__ | 1288 | #ifndef __FreeBSD__ |
