Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

20241022-cleanups #8100

Merged
merged 6 commits into from
Oct 23, 2024
Merged

20241022-cleanups #8100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6429315
fix references to misnamed HAVE_SHA224, HAVE_SHA384, HAVE_SHA512 (cor…
douzzer Oct 22, 2024
bffcfb7
wolfcrypt/src/ecc.c: in wc_ecc_get_curve_id_from_oid(), deconditional…
douzzer Oct 22, 2024
30181f2
configure.ac: for reproducible-build, use --build-id=sha1, not --buil…
douzzer Oct 22, 2024
508555c
configure.ac: add several missing low level crypto algorithms to all-…
douzzer Oct 23, 2024
3bbd00f
wolfcrypt/src/asn.c: tweak retval handling in MakeSignature() CERTSIG…
douzzer Oct 23, 2024
ea491b8
tests/api.c: gate test_GENERAL_NAME_set0_othername() on OPENSSL_ALL, …
douzzer Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,16 +573,15 @@ then
AM_CFLAGS="$AM_CFLAGS -ffile-prefix-map=\$(abs_top_srcdir)/= -ffile-prefix-map=\$(top_srcdir)/="
fi

# opportunistically use linker option --build-id=none

if "$CC" -Wl,--build-id=none -x c - -o /dev/null >/dev/null 2>&1 <<' EOF'
# opportunistically force linker option --build-id=sha1 (usually the default)
if "$CC" -Wl,--build-id=sha1 -x c - -o /dev/null >/dev/null 2>&1 <<' EOF'
#include <stdlib.h>
int main(int argc, char **argv) {
(void)argc; (void)argv; return 0;
}
EOF
then
AM_LDFLAGS="$AM_LDFLAGS -Wl,--build-id=none"
AM_LDFLAGS="$AM_LDFLAGS -Wl,--build-id=sha1"
fi
fi

Expand Down Expand Up @@ -1156,7 +1155,8 @@ then
test "$enable_dsa" = "" && test "$enable_sha" != "no" && enable_dsa=yes
if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -le 5; then
test "$enable_ecccustcurves" = "" && enable_ecccustcurves=yes
test "$enable_brainpool" = "" && enable_brainpool=yes
test "$enable_ecccustcurves" != "no" && test "$enable_brainpool" = "" && enable_brainpool=yes
test "$enable_ecccustcurves" != "no" && AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC_CDH -DHAVE_ECC_KOBLITZ -DHAVE_ECC_SECPR2 -DHAVE_ECC_SECPR3"
fi
test "$enable_srp" = "" && enable_srp=yes
fi
Expand Down Expand Up @@ -1195,6 +1195,7 @@ then

if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -le 5; then
test "$enable_des3" = "" && enable_des3=yes
test "$enable_des3" != "no" && AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB"
fi

AM_CFLAGS="$AM_CFLAGS -DHAVE_AES_DECRYPT -DHAVE_AES_ECB -DWOLFSSL_ALT_NAMES"
Expand Down
6 changes: 3 additions & 3 deletions src/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15108,7 +15108,7 @@ static WC_INLINE const char* wolfssl_mac_to_string(int mac)
macStr = "SHA1";
break;
#endif
#ifdef HAVE_SHA224
#ifdef WOLFSSL_SHA224
case sha224_mac:
macStr = "SHA224";
break;
Expand All @@ -15118,12 +15118,12 @@ static WC_INLINE const char* wolfssl_mac_to_string(int mac)
macStr = "SHA256";
break;
#endif
#ifdef HAVE_SHA384
#ifdef WOLFSSL_SHA384
case sha384_mac:
macStr = "SHA384";
break;
#endif
#ifdef HAVE_SHA512
#ifdef WOLFSSL_SHA512
case sha512_mac:
macStr = "SHA512";
break;
Expand Down
2 changes: 1 addition & 1 deletion tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68600,7 +68600,7 @@ static int test_GENERAL_NAME_set0_othername(void) {
/* Note the lack of wolfSSL_ prefix...this is a compatibility layer test. */
static int test_othername_and_SID_ext(void) {
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
#if defined(OPENSSL_ALL) && !defined(NO_CERTS) && \
defined(WOLFSSL_CERT_GEN) && defined(WOLFSSL_CERT_REQ) && \
defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ALT_NAMES) && \
defined(WOLFSSL_CERT_EXT) && !defined(NO_FILESYSTEM) && \
Expand Down
5 changes: 4 additions & 1 deletion wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30198,7 +30198,7 @@ static int MakeSignature(CertSignCtx* certSignCtx, const byte* buf, word32 sz,

case CERTSIGN_STATE_DO:
certSignCtx->state = CERTSIGN_STATE_DO;
ret = ALGO_ID_E; /* default to error */
ret = -1; /* default to error, reassigned to ALGO_ID_E below. */

#ifndef NO_RSA
if (rsaKey) {
Expand Down Expand Up @@ -30281,6 +30281,9 @@ static int MakeSignature(CertSignCtx* certSignCtx, const byte* buf, word32 sz,
}
#endif /* HAVE_SPHINCS */

if (ret == -1)
ret = ALGO_ID_E;

break;
}

Expand Down
2 changes: 0 additions & 2 deletions wolfcrypt/src/ecc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4554,13 +4554,11 @@ int wc_ecc_get_curve_id_from_oid(const byte* oid, word32 len)
}
#endif

#if !defined(HAVE_OID_ENCODING) && !defined(HAVE_OID_DECODING)
if (len == 0) {
/* SAKKE has zero oidSz and will otherwise match with len==0. */
WOLFSSL_MSG("zero oidSz");
return ECC_CURVE_INVALID;
}
#endif

for (curve_idx = 0; ecc_sets[curve_idx].size != 0; curve_idx++) {
#if defined(HAVE_OID_ENCODING) && !defined(HAVE_OID_DECODING)
Expand Down
2 changes: 1 addition & 1 deletion wolfssl/wolfcrypt/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,7 +1481,7 @@ extern void uITRON4_free(void *p) ;
#ifndef NO_WRITEV
#define NO_WRITEV
#endif
#ifndef HAVE_SHA512
#ifndef WOLFSSL_SHA512
#ifndef NO_SHA512
#define NO_SHA512
#endif
Expand Down
Loading