mirror of
https://github.com/openssl/openssl.git
synced 2024-12-03 05:41:46 +08:00
e6e9170d6e
Based on the description in https://github.com/openssl/openssl/pull/5757, this re-implements the "allow NULL to be passed" behavior of a number of xxx_free routines. I also fixed up some egregious formatting errors that were nearby. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5761)
318 lines
8.5 KiB
C
318 lines
8.5 KiB
C
/*
|
|
* Copyright 1995-2016 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
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/txt_db.h>
|
|
|
|
#undef BUFSIZE
|
|
#define BUFSIZE 512
|
|
|
|
TXT_DB *TXT_DB_read(BIO *in, int num)
|
|
{
|
|
TXT_DB *ret = NULL;
|
|
int esc = 0;
|
|
long ln = 0;
|
|
int i, add, n;
|
|
int size = BUFSIZE;
|
|
int offset = 0;
|
|
char *p, *f;
|
|
OPENSSL_STRING *pp;
|
|
BUF_MEM *buf = NULL;
|
|
|
|
if ((buf = BUF_MEM_new()) == NULL)
|
|
goto err;
|
|
if (!BUF_MEM_grow(buf, size))
|
|
goto err;
|
|
|
|
if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL)
|
|
goto err;
|
|
ret->num_fields = num;
|
|
ret->index = NULL;
|
|
ret->qual = NULL;
|
|
if ((ret->data = sk_OPENSSL_PSTRING_new_null()) == NULL)
|
|
goto err;
|
|
if ((ret->index = OPENSSL_malloc(sizeof(*ret->index) * num)) == NULL)
|
|
goto err;
|
|
if ((ret->qual = OPENSSL_malloc(sizeof(*(ret->qual)) * num)) == NULL)
|
|
goto err;
|
|
for (i = 0; i < num; i++) {
|
|
ret->index[i] = NULL;
|
|
ret->qual[i] = NULL;
|
|
}
|
|
|
|
add = (num + 1) * sizeof(char *);
|
|
buf->data[size - 1] = '\0';
|
|
offset = 0;
|
|
for (;;) {
|
|
if (offset != 0) {
|
|
size += BUFSIZE;
|
|
if (!BUF_MEM_grow_clean(buf, size))
|
|
goto err;
|
|
}
|
|
buf->data[offset] = '\0';
|
|
BIO_gets(in, &(buf->data[offset]), size - offset);
|
|
ln++;
|
|
if (buf->data[offset] == '\0')
|
|
break;
|
|
if ((offset == 0) && (buf->data[0] == '#'))
|
|
continue;
|
|
i = strlen(&(buf->data[offset]));
|
|
offset += i;
|
|
if (buf->data[offset - 1] != '\n')
|
|
continue;
|
|
else {
|
|
buf->data[offset - 1] = '\0'; /* blat the '\n' */
|
|
if ((p = OPENSSL_malloc(add + offset)) == NULL)
|
|
goto err;
|
|
offset = 0;
|
|
}
|
|
pp = (char **)p;
|
|
p += add;
|
|
n = 0;
|
|
pp[n++] = p;
|
|
i = 0;
|
|
f = buf->data;
|
|
|
|
esc = 0;
|
|
for (;;) {
|
|
if (*f == '\0')
|
|
break;
|
|
if (*f == '\t') {
|
|
if (esc)
|
|
p--;
|
|
else {
|
|
*(p++) = '\0';
|
|
f++;
|
|
if (n >= num)
|
|
break;
|
|
pp[n++] = p;
|
|
continue;
|
|
}
|
|
}
|
|
esc = (*f == '\\');
|
|
*(p++) = *(f++);
|
|
}
|
|
*(p++) = '\0';
|
|
if ((n != num) || (*f != '\0')) {
|
|
OPENSSL_free(pp);
|
|
ret->error = DB_ERROR_WRONG_NUM_FIELDS;
|
|
goto err;
|
|
}
|
|
pp[n] = p;
|
|
if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
|
|
OPENSSL_free(pp);
|
|
goto err;
|
|
}
|
|
}
|
|
BUF_MEM_free(buf);
|
|
return ret;
|
|
err:
|
|
BUF_MEM_free(buf);
|
|
if (ret != NULL) {
|
|
sk_OPENSSL_PSTRING_free(ret->data);
|
|
OPENSSL_free(ret->index);
|
|
OPENSSL_free(ret->qual);
|
|
OPENSSL_free(ret);
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
|
|
OPENSSL_STRING *value)
|
|
{
|
|
OPENSSL_STRING *ret;
|
|
LHASH_OF(OPENSSL_STRING) *lh;
|
|
|
|
if (idx >= db->num_fields) {
|
|
db->error = DB_ERROR_INDEX_OUT_OF_RANGE;
|
|
return NULL;
|
|
}
|
|
lh = db->index[idx];
|
|
if (lh == NULL) {
|
|
db->error = DB_ERROR_NO_INDEX;
|
|
return NULL;
|
|
}
|
|
ret = lh_OPENSSL_STRING_retrieve(lh, value);
|
|
db->error = DB_ERROR_OK;
|
|
return ret;
|
|
}
|
|
|
|
int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *),
|
|
OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp)
|
|
{
|
|
LHASH_OF(OPENSSL_STRING) *idx;
|
|
OPENSSL_STRING *r, *k;
|
|
int i, n;
|
|
|
|
if (field >= db->num_fields) {
|
|
db->error = DB_ERROR_INDEX_OUT_OF_RANGE;
|
|
return 0;
|
|
}
|
|
/* FIXME: we lose type checking at this point */
|
|
if ((idx = (LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(hash, cmp)) == NULL) {
|
|
db->error = DB_ERROR_MALLOC;
|
|
return 0;
|
|
}
|
|
n = sk_OPENSSL_PSTRING_num(db->data);
|
|
for (i = 0; i < n; i++) {
|
|
r = sk_OPENSSL_PSTRING_value(db->data, i);
|
|
if ((qual != NULL) && (qual(r) == 0))
|
|
continue;
|
|
if ((k = lh_OPENSSL_STRING_insert(idx, r)) != NULL) {
|
|
db->error = DB_ERROR_INDEX_CLASH;
|
|
db->arg1 = sk_OPENSSL_PSTRING_find(db->data, k);
|
|
db->arg2 = i;
|
|
lh_OPENSSL_STRING_free(idx);
|
|
return 0;
|
|
}
|
|
if (lh_OPENSSL_STRING_retrieve(idx, r) == NULL) {
|
|
db->error = DB_ERROR_MALLOC;
|
|
lh_OPENSSL_STRING_free(idx);
|
|
return 0;
|
|
}
|
|
}
|
|
lh_OPENSSL_STRING_free(db->index[field]);
|
|
db->index[field] = idx;
|
|
db->qual[field] = qual;
|
|
return 1;
|
|
}
|
|
|
|
long TXT_DB_write(BIO *out, TXT_DB *db)
|
|
{
|
|
long i, j, n, nn, l, tot = 0;
|
|
char *p, **pp, *f;
|
|
BUF_MEM *buf = NULL;
|
|
long ret = -1;
|
|
|
|
if ((buf = BUF_MEM_new()) == NULL)
|
|
goto err;
|
|
n = sk_OPENSSL_PSTRING_num(db->data);
|
|
nn = db->num_fields;
|
|
for (i = 0; i < n; i++) {
|
|
pp = sk_OPENSSL_PSTRING_value(db->data, i);
|
|
|
|
l = 0;
|
|
for (j = 0; j < nn; j++) {
|
|
if (pp[j] != NULL)
|
|
l += strlen(pp[j]);
|
|
}
|
|
if (!BUF_MEM_grow_clean(buf, (int)(l * 2 + nn)))
|
|
goto err;
|
|
|
|
p = buf->data;
|
|
for (j = 0; j < nn; j++) {
|
|
f = pp[j];
|
|
if (f != NULL)
|
|
for (;;) {
|
|
if (*f == '\0')
|
|
break;
|
|
if (*f == '\t')
|
|
*(p++) = '\\';
|
|
*(p++) = *(f++);
|
|
}
|
|
*(p++) = '\t';
|
|
}
|
|
p[-1] = '\n';
|
|
j = p - buf->data;
|
|
if (BIO_write(out, buf->data, (int)j) != j)
|
|
goto err;
|
|
tot += j;
|
|
}
|
|
ret = tot;
|
|
err:
|
|
BUF_MEM_free(buf);
|
|
return ret;
|
|
}
|
|
|
|
int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
|
|
{
|
|
int i;
|
|
OPENSSL_STRING *r;
|
|
|
|
for (i = 0; i < db->num_fields; i++) {
|
|
if (db->index[i] != NULL) {
|
|
if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
|
|
continue;
|
|
r = lh_OPENSSL_STRING_retrieve(db->index[i], row);
|
|
if (r != NULL) {
|
|
db->error = DB_ERROR_INDEX_CLASH;
|
|
db->arg1 = i;
|
|
db->arg_row = r;
|
|
goto err;
|
|
}
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < db->num_fields; i++) {
|
|
if (db->index[i] != NULL) {
|
|
if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
|
|
continue;
|
|
(void)lh_OPENSSL_STRING_insert(db->index[i], row);
|
|
if (lh_OPENSSL_STRING_retrieve(db->index[i], row) == NULL)
|
|
goto err1;
|
|
}
|
|
}
|
|
if (!sk_OPENSSL_PSTRING_push(db->data, row))
|
|
goto err1;
|
|
return 1;
|
|
|
|
err1:
|
|
db->error = DB_ERROR_MALLOC;
|
|
while (i-- > 0) {
|
|
if (db->index[i] != NULL) {
|
|
if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
|
|
continue;
|
|
(void)lh_OPENSSL_STRING_delete(db->index[i], row);
|
|
}
|
|
}
|
|
err:
|
|
return 0;
|
|
}
|
|
|
|
void TXT_DB_free(TXT_DB *db)
|
|
{
|
|
int i, n;
|
|
char **p, *max;
|
|
|
|
if (db == NULL)
|
|
return;
|
|
if (db->index != NULL) {
|
|
for (i = db->num_fields - 1; i >= 0; i--)
|
|
lh_OPENSSL_STRING_free(db->index[i]);
|
|
OPENSSL_free(db->index);
|
|
}
|
|
OPENSSL_free(db->qual);
|
|
if (db->data != NULL) {
|
|
for (i = sk_OPENSSL_PSTRING_num(db->data) - 1; i >= 0; i--) {
|
|
/*
|
|
* check if any 'fields' have been allocated from outside of the
|
|
* initial block
|
|
*/
|
|
p = sk_OPENSSL_PSTRING_value(db->data, i);
|
|
max = p[db->num_fields]; /* last address */
|
|
if (max == NULL) { /* new row */
|
|
for (n = 0; n < db->num_fields; n++)
|
|
OPENSSL_free(p[n]);
|
|
} else {
|
|
for (n = 0; n < db->num_fields; n++) {
|
|
if (((p[n] < (char *)p) || (p[n] > max)))
|
|
OPENSSL_free(p[n]);
|
|
}
|
|
}
|
|
OPENSSL_free(sk_OPENSSL_PSTRING_value(db->data, i));
|
|
}
|
|
sk_OPENSSL_PSTRING_free(db->data);
|
|
}
|
|
OPENSSL_free(db);
|
|
}
|