Skip to content

Commit c4400a1

Browse files
committed
Address copilot feedback
1 parent 4791d8c commit c4400a1

3 files changed

Lines changed: 16 additions & 11 deletions

File tree

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ fi
16531653
AC_ARG_ENABLE([tailscale],
16541654
[AS_HELP_STRING([--enable-tailscale],[Enable Tailscale build dependencies (default: disabled)])],
16551655
[ ENABLED_TAILSCALE=$enableval ],
1656-
[ ENABLED_TAILSCALE=no ]
1656+
[ ENABLED_TAILSCALE=${enable_tailscale:-no} ]
16571657
)
16581658
if test "$ENABLED_TAILSCALE" = "yes"
16591659
then

wolfssl/wolfcrypt/oid_sum.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,10 @@ enum Extensions_Sum {
412412
ISSUE_ALT_NAMES_OID = 132, /* 2.5.29.18 */
413413
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x18 */
414414
TLS_FEATURE_OID = 92, /* 1.3.6.1.5.5.7.1.24 */
415+
#ifdef WOLFSSL_ACME_OID
416+
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x1f */
417+
ACME_IDENTIFIER_OID = 99, /* 1.3.6.1.5.5.7.1.31 */
418+
#endif
415419
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x08,0x07 */
416420
DNS_SRV_OID = 82, /* 1.3.6.1.5.5.7.8.7 */
417421
/* 0x60,0x86,0x48,0x01,0x86,0xf8,0x42,0x01,0x01 */
@@ -431,11 +435,7 @@ enum Extensions_Sum {
431435
/* 0x55,0x1d,0x49 */
432436
ALT_SIG_ALG_OID = 187, /* 2.5.29.73 */
433437
/* 0x55,0x1d,0x4a */
434-
ALT_SIG_VAL_OID = 188, /* 2.5.29.74 */
435-
#ifdef WOLFSSL_ACME_OID
436-
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x1f */
437-
ACME_IDENTIFIER_OID = 99 /* 1.3.6.1.5.5.7.1.31 */
438-
#endif
438+
ALT_SIG_VAL_OID = 188 /* 2.5.29.74 */
439439
#else
440440
/* 0x55,0x1d,0x13 */
441441
BASIC_CA_OID = 0x7fec1daa, /* 2.5.29.19 */
@@ -473,6 +473,10 @@ enum Extensions_Sum {
473473
ISSUE_ALT_NAMES_OID = 0x7fed1daa, /* 2.5.29.18 */
474474
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x18 */
475475
TLS_FEATURE_OID = 0x1d00012e, /* 1.3.6.1.5.5.7.1.24 */
476+
#ifdef WOLFSSL_ACME_OID
477+
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x1f */
478+
ACME_IDENTIFIER_OID = 0x1a00012e, /* 1.3.6.1.5.5.7.1.31 */
479+
#endif
476480
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x08,0x07 */
477481
DNS_SRV_OID = 0x0209012e, /* 1.3.6.1.5.5.7.8.7 */
478482
/* 0x60,0x86,0x48,0x01,0x86,0xf8,0x42,0x01,0x01 */
@@ -492,11 +496,7 @@ enum Extensions_Sum {
492496
/* 0x55,0x1d,0x49 */
493497
ALT_SIG_ALG_OID = 0x7fb61daa, /* 2.5.29.73 */
494498
/* 0x55,0x1d,0x4a */
495-
ALT_SIG_VAL_OID = 0x7fb51daa, /* 2.5.29.74 */
496-
#ifdef WOLFSSL_ACME_OID
497-
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x1f */
498-
ACME_IDENTIFIER_OID = 0x1a00012e /* 1.3.6.1.5.5.7.1.31 */
499-
#endif
499+
ALT_SIG_VAL_OID = 0x7fb51daa /* 2.5.29.74 */
500500
#endif
501501
};
502502

wolfssl/wolfcrypt/settings.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,11 @@
558558
#define HAVE_OID_DECODING
559559
#endif /* WOLFSSL_DUAL_ALG_CERTS */
560560

561+
/* RFC 8737 id-pe-acmeIdentifier (TLS-ALPN-01) requires SHA-256. */
562+
#if defined(WOLFSSL_ACME_OID) && defined(NO_SHA256)
563+
#undef WOLFSSL_ACME_OID
564+
#endif
565+
561566

562567
#if defined(_WIN32) && !defined(_M_X64) && \
563568
defined(HAVE_AESGCM) && defined(WOLFSSL_AESNI)

0 commit comments

Comments
 (0)