From d74a1888bb34b8b5dae1ad69c3969aa41601ed89 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Fri, 6 Dec 2019 06:28:25 +0900 Subject: [PATCH 1/2] move it to build option --- wolfssl/internal.h | 4 ---- wolfssl/wolfcrypt/asn.h | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/wolfssl/internal.h b/wolfssl/internal.h index f2227a708..e3232e856 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -3490,10 +3490,6 @@ struct WOLFSSL_X509_NAME { #endif }; -#ifndef EXTERNAL_SERIAL_SIZE - #define EXTERNAL_SERIAL_SIZE 32 -#endif - #ifdef NO_ASN typedef struct DNS_entry DNS_entry; #endif diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index 9f9b692e0..e2c4db31d 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -66,12 +66,14 @@ extern "C" { #endif +#ifndef EXTERNAL_SERIAL_SIZE + #define EXTERNAL_SERIAL_SIZE 32 +#endif + enum { ISSUER = 0, SUBJECT = 1, - EXTERNAL_SERIAL_SIZE = 32, - BEFORE = 0, AFTER = 1 }; From 87ec950221c9bfb1e448f2a6df64957b6ccf3539 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Fri, 6 Dec 2019 10:31:28 +0900 Subject: [PATCH 2/2] Rollback the define in internal.h --- wolfssl/internal.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wolfssl/internal.h b/wolfssl/internal.h index e3232e856..f2227a708 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -3490,6 +3490,10 @@ struct WOLFSSL_X509_NAME { #endif }; +#ifndef EXTERNAL_SERIAL_SIZE + #define EXTERNAL_SERIAL_SIZE 32 +#endif + #ifdef NO_ASN typedef struct DNS_entry DNS_entry; #endif