mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-09-23 11:21:11 +00:00
Code Issues Projects Releases Wiki Activity

ntp: fix build with OpenSSL 4.0

Browse Source 
do_compile fails with:

  ntp_crypto.c:2035:23: error: invalid use of incomplete typedef
  'ASN1_TIME' {aka 'const struct asn1_string_st'}

Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Alper Ak
2026-09-11 07:07:58 -07:00
committed by Khem Raj
parent 11066da803
commit 77bc6e2615
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/ntp/ntp/0001-ntp_crypto-use-the-ASN1_STRING-accessors.patch
+39
View File
@@ -0,0 +1,39 @@
From: Alper Ak <alperyasinak1@gmail.com>
Date: Wed, 9 Sep 2026 23:30:00 +0300
Subject: [PATCH] ntp_crypto: use the ASN1_STRING accessors
ASN1_STRING is opaque in OpenSSL 4, so asn1time->length and data->data
no longer compile. The accessors have been available since OpenSSL
1.1.0, which this file already requires.
Upstream-Status: Pending
Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
---
ntpd/ntp_crypto.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -2032,9 +2032,9 @@
* Also note that two-digit years less than 50 map to years greater than
* 100. Dontcha love ASN.1? Better than MIL-188.
*/
- len = asn1time->length;
+ len = ASN1_STRING_length(asn1time);
REQUIRE(len < sizeof(v));
- (void)strncpy(v, (char *)(asn1time->data), len);
+ (void)strncpy(v, (const char *)ASN1_STRING_get0_data(asn1time), len);
REQUIRE(len >= 13);
temp = strtoul(v+len-3, NULL, 10);
pjd->second = temp;
@@ -3551,8 +3551,8 @@
*/
case NID_subject_key_identifier:
data = X509_EXTENSION_get_data(ext);
- ret->grpkey = BN_bin2bn(&data->data[2],
- data->length - 2, NULL);
+ ret->grpkey = BN_bin2bn(ASN1_STRING_get0_data(data) + 2,
+ ASN1_STRING_length(data) - 2, NULL);
/* fall through */
default:
DPRINTF(1, ("cert_parse: %s\n",
meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
+1
View File
@@ -20,6 +20,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
file://0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch \
file://0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch \
file://0001-Makefile.am-Don-t-build-deprecated-ntpdate.patch \
file://0001-ntp_crypto-use-the-ASN1_STRING-accessors.patch \
file://ntpd \
file://ntp.conf \
file://ntpd.service \