projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent a possible recursion in ERR_get_state and fix the problem that
[openssl.git]
/
crypto
/
err
/
err.c
diff --git
a/crypto/err/err.c
b/crypto/err/err.c
index f31bfc8f559501d19747a5bfb501f9a7cbac8646..f55655c6b62eb7aafb70ba95a76ac02c7b1a51b3 100644
(file)
--- a/
crypto/err/err.c
+++ b/
crypto/err/err.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
8
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
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-10,16
+10,15
@@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
-#include <internal/cryptlib_int.h>
-#include <internal/err.h>
-#include <internal/err_int.h>
-#include <openssl/lhash.h>
+#include "internal/cryptlib_int.h"
+#include "internal/err.h"
+#include "internal/err_int.h"
#include <openssl/err.h>
#include <openssl/crypto.h>
#include <openssl/buffer.h>
#include <openssl/bio.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
#include <openssl/crypto.h>
#include <openssl/buffer.h>
#include <openssl/bio.h>
#include <openssl/opensslconf.h>
-#include
<internal/thread_once.h>
+#include
"internal/thread_once.h"
static int err_load_strings(const ERR_STRING_DATA *str);
static int err_load_strings(const ERR_STRING_DATA *str);
@@
-60,6
+59,8
@@
static ERR_STRING_DATA ERR_str_libraries[] = {
{ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines"},
{ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines"},
{ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines"},
{ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines"},
{ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines"},
{ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines"},
+ {ERR_PACK(ERR_LIB_OSSL_STORE, 0, 0), "STORE routines"},
+ {ERR_PACK(ERR_LIB_SM2, 0, 0), "SM2 routines"},
{0, NULL},
};
{0, NULL},
};
@@
-84,6
+85,12
@@
static ERR_STRING_DATA ERR_str_functs[] = {
{ERR_PACK(0, SYS_F_GETSOCKNAME, 0), "getsockname"},
{ERR_PACK(0, SYS_F_GETHOSTBYNAME, 0), "gethostbyname"},
{ERR_PACK(0, SYS_F_FFLUSH, 0), "fflush"},
{ERR_PACK(0, SYS_F_GETSOCKNAME, 0), "getsockname"},
{ERR_PACK(0, SYS_F_GETHOSTBYNAME, 0), "gethostbyname"},
{ERR_PACK(0, SYS_F_FFLUSH, 0), "fflush"},
+ {ERR_PACK(0, SYS_F_OPEN, 0), "open"},
+ {ERR_PACK(0, SYS_F_CLOSE, 0), "close"},
+ {ERR_PACK(0, SYS_F_IOCTL, 0), "ioctl"},
+ {ERR_PACK(0, SYS_F_STAT, 0), "stat"},
+ {ERR_PACK(0, SYS_F_FCNTL, 0), "fcntl"},
+ {ERR_PACK(0, SYS_F_FSTAT, 0), "fstat"},
{0, NULL},
};
{0, NULL},
};
@@
-104,6
+111,8
@@
static ERR_STRING_DATA ERR_str_reasons[] = {
{ERR_R_PKCS7_LIB, "PKCS7 lib"},
{ERR_R_X509V3_LIB, "X509V3 lib"},
{ERR_R_ENGINE_LIB, "ENGINE lib"},
{ERR_R_PKCS7_LIB, "PKCS7 lib"},
{ERR_R_X509V3_LIB, "X509V3 lib"},
{ERR_R_ENGINE_LIB, "ENGINE lib"},
+ {ERR_R_UI_LIB, "UI lib"},
+ {ERR_R_OSSL_STORE_LIB, "STORE lib"},
{ERR_R_ECDSA_LIB, "ECDSA lib"},
{ERR_R_NESTED_ASN1_ERROR, "nested asn1 error"},
{ERR_R_ECDSA_LIB, "ECDSA lib"},
{ERR_R_NESTED_ASN1_ERROR, "nested asn1 error"},
@@
-117,6
+126,7
@@
static ERR_STRING_DATA ERR_str_reasons[] = {
{ERR_R_INTERNAL_ERROR, "internal error"},
{ERR_R_DISABLED, "called a function that was disabled at compile-time"},
{ERR_R_INIT_FAIL, "init fail"},
{ERR_R_INTERNAL_ERROR, "internal error"},
{ERR_R_DISABLED, "called a function that was disabled at compile-time"},
{ERR_R_INIT_FAIL, "init fail"},
+ {ERR_R_OPERATION_FAIL, "operation fail"},
{0, NULL},
};
{0, NULL},
};
@@
-154,7
+164,9
@@
static unsigned long err_string_data_hash(const ERR_STRING_DATA *a)
static int err_string_data_cmp(const ERR_STRING_DATA *a,
const ERR_STRING_DATA *b)
{
static int err_string_data_cmp(const ERR_STRING_DATA *a,
const ERR_STRING_DATA *b)
{
- return (int)(a->error - b->error);
+ if (a->error == b->error)
+ return 0;
+ return a->error > b->error ? 1 : -1;
}
static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d)
}
static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d)
@@
-221,24
+233,23
@@
static void build_SYS_str_reasons(void)
}
#endif
}
#endif
-#define err_clear_data(p,i) \
+#define err_clear_data(p,
i) \
do { \
do { \
- if ((p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
- { \
+ if ((p)->err_data_flags[i] & ERR_TXT_MALLOCED) {\
OPENSSL_free((p)->err_data[i]); \
OPENSSL_free((p)->err_data[i]); \
- (p)->err_data[i]
=
NULL; \
-
} \
-
(p)->err_data_flags[i]=
0; \
- } while(0)
+ (p)->err_data[i]
=
NULL; \
+ } \
+
(p)->err_data_flags[i] =
0; \
+ } while
(0)
-#define err_clear(p,i) \
+#define err_clear(p,
i) \
do { \
do { \
-
(p)->err_flags[i]=0
; \
-
(p)->err_buffer[i]=
0; \
-
err_clear_data(p,i)
; \
-
(p)->err_file[i]=
NULL; \
-
(p)->err_line[i]
= -1; \
- } while(0)
+
err_clear_data(p, i)
; \
+
(p)->err_flags[i] =
0; \
+
(p)->err_buffer[i] = 0
; \
+
(p)->err_file[i] =
NULL; \
+
(p)->err_line[i]
= -1; \
+ } while
(0)
static void ERR_STATE_free(ERR_STATE *s)
{
static void ERR_STATE_free(ERR_STATE *s)
{
@@
-246,7
+257,6
@@
static void ERR_STATE_free(ERR_STATE *s)
if (s == NULL)
return;
if (s == NULL)
return;
-
for (i = 0; i < ERR_NUM_ERRORS; i++) {
err_clear_data(s, i);
}
for (i = 0; i < ERR_NUM_ERRORS; i++) {
err_clear_data(s, i);
}
@@
-378,6
+388,8
@@
void ERR_put_error(int lib, int func, int reason, const char *file, int line)
}
#endif
es = ERR_get_state();
}
#endif
es = ERR_get_state();
+ if (es == NULL)
+ return;
es->top = (es->top + 1) % ERR_NUM_ERRORS;
if (es->top == es->bottom)
es->top = (es->top + 1) % ERR_NUM_ERRORS;
if (es->top == es->bottom)
@@
-395,6
+407,8
@@
void ERR_clear_error(void)
ERR_STATE *es;
es = ERR_get_state();
ERR_STATE *es;
es = ERR_get_state();
+ if (es == NULL)
+ return;
for (i = 0; i < ERR_NUM_ERRORS; i++) {
err_clear(es, i);
for (i = 0; i < ERR_NUM_ERRORS; i++) {
err_clear(es, i);
@@
-404,50
+418,50
@@
void ERR_clear_error(void)
unsigned long ERR_get_error(void)
{
unsigned long ERR_get_error(void)
{
- return
(get_error_values(1, 0, NULL, NULL, NULL, NULL)
);
+ return
get_error_values(1, 0, NULL, NULL, NULL, NULL
);
}
unsigned long ERR_get_error_line(const char **file, int *line)
{
}
unsigned long ERR_get_error_line(const char **file, int *line)
{
- return
(get_error_values(1, 0, file, line, NULL, NULL)
);
+ return
get_error_values(1, 0, file, line, NULL, NULL
);
}
unsigned long ERR_get_error_line_data(const char **file, int *line,
const char **data, int *flags)
{
}
unsigned long ERR_get_error_line_data(const char **file, int *line,
const char **data, int *flags)
{
- return
(get_error_values(1, 0, file, line, data, flags)
);
+ return
get_error_values(1, 0, file, line, data, flags
);
}
unsigned long ERR_peek_error(void)
{
}
unsigned long ERR_peek_error(void)
{
- return
(get_error_values(0, 0, NULL, NULL, NULL, NULL)
);
+ return
get_error_values(0, 0, NULL, NULL, NULL, NULL
);
}
unsigned long ERR_peek_error_line(const char **file, int *line)
{
}
unsigned long ERR_peek_error_line(const char **file, int *line)
{
- return
(get_error_values(0, 0, file, line, NULL, NULL)
);
+ return
get_error_values(0, 0, file, line, NULL, NULL
);
}
unsigned long ERR_peek_error_line_data(const char **file, int *line,
const char **data, int *flags)
{
}
unsigned long ERR_peek_error_line_data(const char **file, int *line,
const char **data, int *flags)
{
- return
(get_error_values(0, 0, file, line, data, flags)
);
+ return
get_error_values(0, 0, file, line, data, flags
);
}
unsigned long ERR_peek_last_error(void)
{
}
unsigned long ERR_peek_last_error(void)
{
- return
(get_error_values(0, 1, NULL, NULL, NULL, NULL)
);
+ return
get_error_values(0, 1, NULL, NULL, NULL, NULL
);
}
unsigned long ERR_peek_last_error_line(const char **file, int *line)
{
}
unsigned long ERR_peek_last_error_line(const char **file, int *line)
{
- return
(get_error_values(0, 1, file, line, NULL, NULL)
);
+ return
get_error_values(0, 1, file, line, NULL, NULL
);
}
unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
const char **data, int *flags)
{
}
unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
const char **data, int *flags)
{
- return
(get_error_values(0, 1, file, line, data, flags)
);
+ return
get_error_values(0, 1, file, line, data, flags
);
}
static unsigned long get_error_values(int inc, int top, const char **file,
}
static unsigned long get_error_values(int inc, int top, const char **file,
@@
-459,6
+473,8
@@
static unsigned long get_error_values(int inc, int top, const char **file,
unsigned long ret;
es = ERR_get_state();
unsigned long ret;
es = ERR_get_state();
+ if (es == NULL)
+ return 0;
if (inc && top) {
if (file)
if (inc && top) {
if (file)
@@
-486,15
+502,13
@@
static unsigned long get_error_values(int inc, int top, const char **file,
es->err_buffer[i] = 0;
}
es->err_buffer[i] = 0;
}
- if (
(file != NULL) && (line != NULL)
) {
+ if (
file != NULL && line != NULL
) {
if (es->err_file[i] == NULL) {
*file = "NA";
if (es->err_file[i] == NULL) {
*file = "NA";
- if (line != NULL)
- *line = 0;
+ *line = 0;
} else {
*file = es->err_file[i];
} else {
*file = es->err_file[i];
- if (line != NULL)
- *line = es->err_line[i];
+ *line = es->err_line[i];
}
}
}
}
@@
-526,45
+540,30
@@
void ERR_error_string_n(unsigned long e, char *buf, size_t len)
return;
l = ERR_GET_LIB(e);
return;
l = ERR_GET_LIB(e);
- f = ERR_GET_FUNC(e);
- r = ERR_GET_REASON(e);
-
ls = ERR_lib_error_string(e);
ls = ERR_lib_error_string(e);
- fs = ERR_func_error_string(e);
- rs = ERR_reason_error_string(e);
-
- if (ls == NULL)
+ if (ls == NULL) {
BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l);
BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l);
- if (fs == NULL)
+ ls = lsbuf;
+ }
+
+ fs = ERR_func_error_string(e);
+ f = ERR_GET_FUNC(e);
+ if (fs == NULL) {
BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f);
BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f);
- if (rs == NULL)
+ fs = fsbuf;
+ }
+
+ rs = ERR_reason_error_string(e);
+ r = ERR_GET_REASON(e);
+ if (rs == NULL) {
BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r);
BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r);
+ rs = rsbuf;
+ }
- BIO_snprintf(buf, len, "error:%08lX:%s:%s:%s", e, ls ? ls : lsbuf,
- fs ? fs : fsbuf, rs ? rs : rsbuf);
+ BIO_snprintf(buf, len, "error:%08lX:%s:%s:%s", e, ls, fs, rs);
if (strlen(buf) == len - 1) {
if (strlen(buf) == len - 1) {
- /*
- * output may be truncated; make sure we always have 5
- * colon-separated fields, i.e. 4 colons ...
- */
-#define NUM_COLONS 4
- if (len > NUM_COLONS) { /* ... if possible */
- int i;
- char *s = buf;
-
- for (i = 0; i < NUM_COLONS; i++) {
- char *colon = strchr(s, ':');
- if (colon == NULL || colon > &buf[len - 1] - NUM_COLONS + i) {
- /*
- * set colon no. i at last possible position (buf[len-1]
- * is the terminating 0)
- */
- colon = &buf[len - 1] - NUM_COLONS + i;
- *colon = ':';
- }
- s = colon + 1;
- }
- }
+ /* Didn't fit; use a minimal format. */
+ BIO_snprintf(buf, len, "err:%lx:%lx:%lx:%lx", e, l, f, r);
}
}
}
}
@@
-578,8
+577,7
@@
char *ERR_error_string(unsigned long e, char *ret)
if (ret == NULL)
ret = buf;
if (ret == NULL)
ret = buf;
- ERR_error_string_n(e, ret, 256);
-
+ ERR_error_string_n(e, ret, (int)sizeof(buf));
return ret;
}
return ret;
}
@@
-636,7
+634,7
@@
const char *ERR_reason_error_string(unsigned long e)
void err_delete_thread_state(void)
{
void err_delete_thread_state(void)
{
- ERR_STATE *state =
ERR_get_state(
);
+ ERR_STATE *state =
CRYPTO_THREAD_get_local(&err_thread_local
);
if (state == NULL)
return;
if (state == NULL)
return;
@@
-670,20
+668,27
@@
ERR_STATE *ERR_get_state(void)
return NULL;
state = CRYPTO_THREAD_get_local(&err_thread_local);
return NULL;
state = CRYPTO_THREAD_get_local(&err_thread_local);
+ if (state == (ERR_STATE*)-1)
+ return NULL;
if (state == NULL) {
if (state == NULL) {
- state = OPENSSL_zalloc(sizeof(*state));
- if (state == NULL)
+ if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1))
return NULL;
return NULL;
- if (!CRYPTO_THREAD_set_local(&err_thread_local, state)) {
+ if ((state = OPENSSL_zalloc(sizeof(*state))) == NULL) {
+ CRYPTO_THREAD_set_local(&err_thread_local, NULL);
+ return NULL;
+ }
+
+ if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE)
+ || !CRYPTO_THREAD_set_local(&err_thread_local, state)) {
ERR_STATE_free(state);
ERR_STATE_free(state);
+ CRYPTO_THREAD_set_local(&err_thread_local, NULL);
return NULL;
}
/* Ignore failures from these */
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
return NULL;
}
/* Ignore failures from these */
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
- ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE);
}
return state;
}
return state;
@@
-709,10
+714,10
@@
void ERR_set_error_data(char *data, int flags)
int i;
es = ERR_get_state();
int i;
es = ERR_get_state();
+ if (es == NULL)
+ return;
i = es->top;
i = es->top;
- if (i == 0)
- i = ERR_NUM_ERRORS - 1;
err_clear_data(es, i);
es->err_data[i] = data;
err_clear_data(es, i);
es->err_data[i] = data;
@@
-733,28
+738,28
@@
void ERR_add_error_vdata(int num, va_list args)
char *str, *p, *a;
s = 80;
char *str, *p, *a;
s = 80;
- str = OPENSSL_malloc(s + 1);
- if (str == NULL)
+ if ((str = OPENSSL_malloc(s + 1)) == NULL) {
+ /* ERRerr(ERR_F_ERR_ADD_ERROR_VDATA, ERR_R_MALLOC_FAILURE); */
return;
return;
+ }
str[0] = '\0';
n = 0;
for (i = 0; i < num; i++) {
a = va_arg(args, char *);
str[0] = '\0';
n = 0;
for (i = 0; i < num; i++) {
a = va_arg(args, char *);
- /* ignore NULLs, thanks to Bob Beck <beck@obtuse.com> */
- if (a != NULL) {
- n += strlen(a);
- if (n > s) {
- s = n + 20;
- p = OPENSSL_realloc(str, s + 1);
- if (p == NULL) {
- OPENSSL_free(str);
- return;
- }
- str = p;
+ if (a == NULL)
+ a = "<NULL>";
+ n += strlen(a);
+ if (n > s) {
+ s = n + 20;
+ p = OPENSSL_realloc(str, s + 1);
+ if (p == NULL) {
+ OPENSSL_free(str);
+ return;
}
}
-
OPENSSL_strlcat(str, a, (size_t)s + 1)
;
+
str = p
;
}
}
+ OPENSSL_strlcat(str, a, (size_t)s + 1);
}
ERR_set_error_data(str, ERR_TXT_MALLOCED | ERR_TXT_STRING);
}
}
ERR_set_error_data(str, ERR_TXT_MALLOCED | ERR_TXT_STRING);
}
@@
-764,6
+769,8
@@
int ERR_set_mark(void)
ERR_STATE *es;
es = ERR_get_state();
ERR_STATE *es;
es = ERR_get_state();
+ if (es == NULL)
+ return 0;
if (es->bottom == es->top)
return 0;
if (es->bottom == es->top)
return 0;
@@
-776,13
+783,13
@@
int ERR_pop_to_mark(void)
ERR_STATE *es;
es = ERR_get_state();
ERR_STATE *es;
es = ERR_get_state();
+ if (es == NULL)
+ return 0;
while (es->bottom != es->top
&& (es->err_flags[es->top] & ERR_FLAG_MARK) == 0) {
err_clear(es, es->top);
while (es->bottom != es->top
&& (es->err_flags[es->top] & ERR_FLAG_MARK) == 0) {
err_clear(es, es->top);
- es->top -= 1;
- if (es->top == -1)
- es->top = ERR_NUM_ERRORS - 1;
+ es->top = es->top > 0 ? es->top - 1 : ERR_NUM_ERRORS - 1;
}
if (es->bottom == es->top)
}
if (es->bottom == es->top)
@@
-790,3
+797,24
@@
int ERR_pop_to_mark(void)
es->err_flags[es->top] &= ~ERR_FLAG_MARK;
return 1;
}
es->err_flags[es->top] &= ~ERR_FLAG_MARK;
return 1;
}
+
+int ERR_clear_last_mark(void)
+{
+ ERR_STATE *es;
+ int top;
+
+ es = ERR_get_state();
+ if (es == NULL)
+ return 0;
+
+ top = es->top;
+ while (es->bottom != top
+ && (es->err_flags[top] & ERR_FLAG_MARK) == 0) {
+ top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
+ }
+
+ if (es->bottom == top)
+ return 0;
+ es->err_flags[top] &= ~ERR_FLAG_MARK;
+ return 1;
+}