diff mbox series

[18/38] backports: update x509.asn1.[ch]

Message ID 20221011230356.c821b5ac8818.I6785155fcf6c1b377312eb2fdabae3b422cc17ca@changeid (mailing list archive)
State New, archived
Headers show
Series backports updates | expand

Commit Message

Johannes Berg Oct. 11, 2022, 9:04 p.m. UTC 
From: Gregory Greenman <gregory.greenman@intel.com>

In v5.18-rc1 a few functions were renamed:
x509_note_pkey_algo() => x509_note_sig_algo()
algo_oid => sig_algo

Adjust for this change.

type=maint
ticket=none

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
---
 backport/compat/verification/x509.asn1.c | 10 +++++-----
 backport/compat/verification/x509.asn1.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/backport/compat/verification/x509.asn1.c b/backport/compat/verification/x509.asn1.c
index e68864b6a1f5..590154e21da2 100644
--- a/backport/compat/verification/x509.asn1.c
+++ b/backport/compat/verification/x509.asn1.c
@@ -14,8 +14,8 @@  enum x509_actions {
 	ACT_x509_note_not_after = 4,
 	ACT_x509_note_not_before = 5,
 	ACT_x509_note_params = 6,
-	ACT_x509_note_pkey_algo = 7,
-	ACT_x509_note_serial = 8,
+	ACT_x509_note_serial = 7,
+	ACT_x509_note_sig_algo = 8,
 	ACT_x509_note_signature = 9,
 	ACT_x509_note_subject = 10,
 	ACT_x509_note_tbs_certificate = 11,
@@ -31,8 +31,8 @@  static const asn1_action_t x509_action_table[NR__x509_actions] = {
 	[   4] = x509_note_not_after,
 	[   5] = x509_note_not_before,
 	[   6] = x509_note_params,
-	[   7] = x509_note_pkey_algo,
-	[   8] = x509_note_serial,
+	[   7] = x509_note_serial,
+	[   8] = x509_note_sig_algo,
 	[   9] = x509_note_signature,
 	[  10] = x509_note_subject,
 	[  11] = x509_note_tbs_certificate,
@@ -59,7 +59,7 @@  static const unsigned char x509_machine[] = {
 	[  12] =   _tag(UNIV, CONS, SEQ),
 	[  13] =   _jump_target(74),		// --> AlgorithmIdentifier
 	[  14] =   ASN1_OP_ACT,
-	[  15] =   _action(ACT_x509_note_pkey_algo),
+	[  15] =   _action(ACT_x509_note_sig_algo),
 	// Name
 	[  16] =   ASN1_OP_MATCH_JUMP,
 	[  17] =   _tag(UNIV, CONS, SEQ),
diff --git a/backport/compat/verification/x509.asn1.h b/backport/compat/verification/x509.asn1.h
index 77ec6085ae75..10648630ade4 100644
--- a/backport/compat/verification/x509.asn1.h
+++ b/backport/compat/verification/x509.asn1.h
@@ -14,8 +14,8 @@  extern int x509_note_issuer(void *, size_t, unsigned char, const void *, size_t)
 extern int x509_note_not_after(void *, size_t, unsigned char, const void *, size_t);
 extern int x509_note_not_before(void *, size_t, unsigned char, const void *, size_t);
 extern int x509_note_params(void *, size_t, unsigned char, const void *, size_t);
-extern int x509_note_pkey_algo(void *, size_t, unsigned char, const void *, size_t);
 extern int x509_note_serial(void *, size_t, unsigned char, const void *, size_t);
+extern int x509_note_sig_algo(void *, size_t, unsigned char, const void *, size_t);
 extern int x509_note_signature(void *, size_t, unsigned char, const void *, size_t);
 extern int x509_note_subject(void *, size_t, unsigned char, const void *, size_t);
 extern int x509_note_tbs_certificate(void *, size_t, unsigned char, const void *, size_t);