/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*/
#include "bio_lcl.h"
-#include <internal/thread_once.h>
+#include "internal/thread_once.h"
CRYPTO_RWLOCK *bio_type_lock = NULL;
static CRYPTO_ONCE bio_type_init = CRYPTO_ONCE_STATIC_INIT;
return bio_type_lock != NULL;
}
-int BIO_get_new_index()
+int BIO_get_new_index(void)
{
- static int bio_count = BIO_TYPE_START;
+ static CRYPTO_REF_COUNT bio_count = BIO_TYPE_START;
int newval;
if (!RUN_ONCE(&bio_type_init, do_bio_type_init)) {
BIOerr(BIO_F_BIO_GET_NEW_INDEX, ERR_R_MALLOC_FAILURE);
return -1;
}
- if (!CRYPTO_atomic_add(&bio_count, 1, &newval, bio_type_lock))
+ if (!CRYPTO_UP_REF(&bio_count, &newval, bio_type_lock))
return -1;
return newval;
}
{
BIO_METHOD *biom = OPENSSL_zalloc(sizeof(BIO_METHOD));
- if (biom != NULL) {
- biom->type = type;
- biom->name = name;
+ if (biom == NULL
+ || (biom->name = OPENSSL_strdup(name)) == NULL) {
+ OPENSSL_free(biom);
+ BIOerr(BIO_F_BIO_METH_NEW, ERR_R_MALLOC_FAILURE);
+ return NULL;
}
+ biom->type = type;
return biom;
}
void BIO_meth_free(BIO_METHOD *biom)
{
- OPENSSL_free(biom);
+ if (biom != NULL) {
+ OPENSSL_free(biom->name);
+ OPENSSL_free(biom);
+ }
}
-int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int)
+int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int)
{
return biom->bwrite_old;
}
-int (*BIO_meth_get_write_ex(BIO_METHOD *biom)) (BIO *, const char *, size_t,
+int (*BIO_meth_get_write_ex(const BIO_METHOD *biom)) (BIO *, const char *, size_t,
size_t *)
{
return biom->bwrite;
}
/* Conversion for old style bwrite to new style */
-int bwrite_conv(BIO *bio, const char *in, size_t inl, size_t *written)
+int bwrite_conv(BIO *bio, const char *data, size_t datal, size_t *written)
{
int ret;
- if (inl > INT_MAX)
- return 0;
+ if (datal > INT_MAX)
+ datal = INT_MAX;
- ret = bio->method->bwrite_old(bio, in, (int)inl);
+ ret = bio->method->bwrite_old(bio, data, (int)datal);
if (ret <= 0) {
*written = 0;
return 1;
}
-int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int)
+int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int)
{
return biom->bread_old;
}
-int (*BIO_meth_get_read_ex(BIO_METHOD *biom)) (BIO *, char *, size_t, size_t *)
+int (*BIO_meth_get_read_ex(const BIO_METHOD *biom)) (BIO *, char *, size_t, size_t *)
{
return biom->bread;
}
/* Conversion for old style bread to new style */
-int bread_conv(BIO *bio, char *out, size_t outl, size_t *read)
+int bread_conv(BIO *bio, char *data, size_t datal, size_t *readbytes)
{
int ret;
- if (outl > INT_MAX)
- outl = INT_MAX;
+ if (datal > INT_MAX)
+ datal = INT_MAX;
- ret = bio->method->bread_old(bio, out, (int)outl);
+ ret = bio->method->bread_old(bio, data, (int)datal);
if (ret <= 0) {
- *read = 0;
+ *readbytes = 0;
return ret;
}
- *read = (size_t)ret;
+ *readbytes = (size_t)ret;
return 1;
}
return 1;
}
-int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *)
+int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *)
{
return biom->bputs;
}
return 1;
}
-int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int)
+int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int)
{
return biom->bgets;
}
return 1;
}
-long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *)
+long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *)
{
return biom->ctrl;
}
return 1;
}
-int (*BIO_meth_get_create(BIO_METHOD *biom)) (BIO *)
+int (*BIO_meth_get_create(const BIO_METHOD *biom)) (BIO *)
{
return biom->create;
}
return 1;
}
-int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *)
+int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *)
{
return biom->destroy;
}
return 1;
}
-long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) (BIO *, int, bio_info_cb *)
+long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *)
{
return biom->callback_ctrl;
}
int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
long (*callback_ctrl) (BIO *, int,
- bio_info_cb *))
+ BIO_info_cb *))
{
biom->callback_ctrl = callback_ctrl;
return 1;