kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Opaquify CONF.

Browse Source 
This removes the last mention of LHASH in public headers. This can only
break people who stack-allocate CONF or access the data field. The
latter does not happen (external code never calls lh_CONF_VALUE_*
functions). The former could not work as there would be no way to clean
it up.

Update-Note: CONF is now opaque.
Change-Id: Iad3796c4e75874530d7a70fde2f84a390def2d49
Reviewed-on: https://boringssl-review.googlesource.com/32118
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2018-09-23 17:41:28 -05:00 committed by CQ bot account: commit-bot@chromium.org
parent 9e97c022e6
commit fac6fb99da
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/conf/conf.c
View File

@ -62,6 +62,7 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/buf.h> #include <openssl/buf.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/lhash.h>
#include <openssl/mem.h> #include <openssl/mem.h>
#include "conf_def.h" #include "conf_def.h"
@ -69,6 +70,10 @@
#include "../internal.h" #include "../internal.h"
struct conf_st {
LHASH_OF(CONF_VALUE) *data;
};
// The maximum length we can grow a value to after variable expansion. 64k // The maximum length we can grow a value to after variable expansion. 64k
// should be more than enough for all reasonable uses. // should be more than enough for all reasonable uses.
#define MAX_CONF_VALUE_LENGTH 65536 #define MAX_CONF_VALUE_LENGTH 65536

5
include/openssl/conf.h
View File

@ -60,7 +60,6 @@
#include <openssl/base.h> #include <openssl/base.h>
#include <openssl/stack.h> #include <openssl/stack.h>
#include <openssl/lhash.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -85,10 +84,6 @@ struct conf_value_st {
char *value; char *value;
}; };
struct conf_st {
LHASH_OF(CONF_VALUE) *data;
};
DEFINE_STACK_OF(CONF_VALUE) DEFINE_STACK_OF(CONF_VALUE)