Merge branch 'diamondo25-patch-2' into develop
Fix not defined warnings (-Wundef) (cherry picked from commit 617698e54459ec9f31c894ba83c6f4dfc5570291)
This commit is contained in:
parent
7f6af93798
commit
a674de7408
@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "tomcrypt.h"
|
#include "tomcrypt.h"
|
||||||
|
|
||||||
#if _POSIX_C_SOURCE >= 200112L
|
#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
#else
|
#else
|
||||||
#define basename(x) x
|
#define basename(x) x
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include <tomcrypt.h>
|
#include <tomcrypt.h>
|
||||||
|
|
||||||
#if _POSIX_C_SOURCE >= 200112L
|
#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
#else
|
#else
|
||||||
#define basename(x) x
|
#define basename(x) x
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
#include "tomcrypt.h"
|
#include "tomcrypt.h"
|
||||||
|
|
||||||
#if _POSIX_C_SOURCE >= 200112L
|
#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
#else
|
#else
|
||||||
#define basename(x) x
|
#define basename(x) x
|
||||||
|
@ -265,7 +265,7 @@ int hkdf_test(void)
|
|||||||
cases[i].info, cases[i].info_l,
|
cases[i].info, cases[i].info_l,
|
||||||
cases[i].IKM, cases[i].IKM_l,
|
cases[i].IKM, cases[i].IKM_l,
|
||||||
OKM, cases[i].OKM_l)) != CRYPT_OK) {
|
OKM, cases[i].OKM_l)) != CRYPT_OK) {
|
||||||
#if LTC_TEST_DBG > 1
|
#if defined(LTC_TEST_DBG) && (LTC_TEST_DBG > 1)
|
||||||
printf("LTC_HKDF-%s test #%d, %s\n", cases[i].Hash, i, error_to_string(err));
|
printf("LTC_HKDF-%s test #%d, %s\n", cases[i].Hash, i, error_to_string(err));
|
||||||
#endif
|
#endif
|
||||||
return err;
|
return err;
|
||||||
|
Loading…
Reference in New Issue
Block a user