diff options
| author | Davide Galassi <davxy@datawok.net> | 2020-02-26 15:31:17 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-02-26 15:31:17 +1000 |
| commit | d27fd991107d668b3f5b96be48f5b4ccd5a6760e (patch) | |
| tree | 657eae8474123d3cac6807de5daefa2f5697a78d /crypto/mem_sec.c | |
| parent | 2c702ef27dd632de08d56456f7f6af11e3e05b5f (diff) | |
| download | openssl-d27fd991107d668b3f5b96be48f5b4ccd5a6760e.zip openssl-d27fd991107d668b3f5b96be48f5b4ccd5a6760e.tar.gz openssl-d27fd991107d668b3f5b96be48f5b4ccd5a6760e.tar.bz2 | |
Mem-sec small code adjustment
Conditional code readability improvement.
Remove unused macro
Commit #11042 has introduced a new, unused, CRYPTO_EX_INDEX macro.
Remove before version release.
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11103)
Diffstat (limited to 'crypto/mem_sec.c')
| -rw-r--r-- | crypto/mem_sec.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 0054616..79362c5 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c @@ -227,9 +227,6 @@ size_t CRYPTO_secure_actual_size(void *ptr) return 0; #endif } -/* END OF PAGE ... - - ... START OF PAGE */ /* * SECURE HEAP IMPLEMENTATION @@ -385,12 +382,12 @@ static int sh_init(size_t size, size_t minsize) OPENSSL_assert(size > 0); OPENSSL_assert((size & (size - 1)) == 0); OPENSSL_assert((minsize & (minsize - 1)) == 0); - if (size <= 0 || (size & (size - 1)) != 0) + if (size == 0 || (size & (size - 1)) != 0) goto err; if (minsize == 0 || (minsize & (minsize - 1)) != 0) goto err; - while (minsize < (int)sizeof(SH_LIST)) + while (minsize < sizeof(SH_LIST)) minsize *= 2; sh.arena_size = size; @@ -437,12 +434,12 @@ static int sh_init(size_t size, size_t minsize) pgsize = PAGE_SIZE; #endif sh.map_size = pgsize + sh.arena_size + pgsize; - if (1) { + #ifdef MAP_ANON - sh.map_result = mmap(NULL, sh.map_size, - PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0); - } else { -#endif + sh.map_result = mmap(NULL, sh.map_size, + PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0); +#else + { int fd; sh.map_result = MAP_FAILED; @@ -452,6 +449,7 @@ static int sh_init(size_t size, size_t minsize) close(fd); } } +#endif if (sh.map_result == MAP_FAILED) goto err; sh.arena = (char *)(sh.map_result + pgsize); |