aboutsummaryrefslogtreecommitdiffstats
path: root/src/crypto/mishmash
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2020-12-08 12:30:57 +0000
committerMichael Brown <mcb30@ipxe.org>2020-12-08 12:38:45 +0000
commite4b6328c84cf3dcbb4af9ba42b2e3cbbb2cfbfee (patch)
tree62272ccce436c733685c2e76612190a54a89c88c /src/crypto/mishmash
parente33f5210813d704477eb16b45fbbaec143d8da95 (diff)
downloadipxe-e4b6328c84cf3dcbb4af9ba42b2e3cbbb2cfbfee.tar.gz
[asn1] Rename ASN1_OID_CURSOR to ASN1_CURSOR
There is nothing OID-specific about the ASN1_OID_CURSOR macro. Rename to allow it to be used for constructing ASN.1 cursors with arbitrary contents. Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/crypto/mishmash')
-rw-r--r--src/crypto/mishmash/oid_md4.c2
-rw-r--r--src/crypto/mishmash/oid_md5.c2
-rw-r--r--src/crypto/mishmash/oid_rsa.c2
-rw-r--r--src/crypto/mishmash/oid_sha1.c2
-rw-r--r--src/crypto/mishmash/oid_sha224.c2
-rw-r--r--src/crypto/mishmash/oid_sha256.c2
-rw-r--r--src/crypto/mishmash/oid_sha384.c2
-rw-r--r--src/crypto/mishmash/oid_sha512.c2
-rw-r--r--src/crypto/mishmash/oid_sha512_224.c2
-rw-r--r--src/crypto/mishmash/oid_sha512_256.c2
-rw-r--r--src/crypto/mishmash/rsa_md5.c2
-rw-r--r--src/crypto/mishmash/rsa_sha1.c2
-rw-r--r--src/crypto/mishmash/rsa_sha224.c2
-rw-r--r--src/crypto/mishmash/rsa_sha256.c2
-rw-r--r--src/crypto/mishmash/rsa_sha384.c2
-rw-r--r--src/crypto/mishmash/rsa_sha512.c2
16 files changed, 16 insertions, 16 deletions
diff --git a/src/crypto/mishmash/oid_md4.c b/src/crypto/mishmash/oid_md4.c
index 1054a79be..d42f2df19 100644
--- a/src/crypto/mishmash/oid_md4.c
+++ b/src/crypto/mishmash/oid_md4.c
@@ -33,5 +33,5 @@ static uint8_t oid_md4[] = { ASN1_OID_MD4 };
struct asn1_algorithm oid_md4_algorithm __asn1_algorithm = {
.name = "md4",
.digest = &md4_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_md4 ),
+ .oid = ASN1_CURSOR ( oid_md4 ),
};
diff --git a/src/crypto/mishmash/oid_md5.c b/src/crypto/mishmash/oid_md5.c
index 96149d096..f56dd8b8d 100644
--- a/src/crypto/mishmash/oid_md5.c
+++ b/src/crypto/mishmash/oid_md5.c
@@ -33,5 +33,5 @@ static uint8_t oid_md5[] = { ASN1_OID_MD5 };
struct asn1_algorithm oid_md5_algorithm __asn1_algorithm = {
.name = "md5",
.digest = &md5_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_md5 ),
+ .oid = ASN1_CURSOR ( oid_md5 ),
};
diff --git a/src/crypto/mishmash/oid_rsa.c b/src/crypto/mishmash/oid_rsa.c
index 1360c3117..582022628 100644
--- a/src/crypto/mishmash/oid_rsa.c
+++ b/src/crypto/mishmash/oid_rsa.c
@@ -34,5 +34,5 @@ struct asn1_algorithm rsa_encryption_algorithm __asn1_algorithm = {
.name = "rsaEncryption",
.pubkey = &rsa_algorithm,
.digest = NULL,
- .oid = ASN1_OID_CURSOR ( oid_rsa_encryption ),
+ .oid = ASN1_CURSOR ( oid_rsa_encryption ),
};
diff --git a/src/crypto/mishmash/oid_sha1.c b/src/crypto/mishmash/oid_sha1.c
index 0ab3bac61..5dae6d27c 100644
--- a/src/crypto/mishmash/oid_sha1.c
+++ b/src/crypto/mishmash/oid_sha1.c
@@ -33,5 +33,5 @@ static uint8_t oid_sha1[] = { ASN1_OID_SHA1 };
struct asn1_algorithm oid_sha1_algorithm __asn1_algorithm = {
.name = "sha1",
.digest = &sha1_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha1 ),
+ .oid = ASN1_CURSOR ( oid_sha1 ),
};
diff --git a/src/crypto/mishmash/oid_sha224.c b/src/crypto/mishmash/oid_sha224.c
index 1ff6884a4..ee7ed22e4 100644
--- a/src/crypto/mishmash/oid_sha224.c
+++ b/src/crypto/mishmash/oid_sha224.c
@@ -33,5 +33,5 @@ static uint8_t oid_sha224[] = { ASN1_OID_SHA224 };
struct asn1_algorithm oid_sha224_algorithm __asn1_algorithm = {
.name = "sha224",
.digest = &sha224_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha224 ),
+ .oid = ASN1_CURSOR ( oid_sha224 ),
};
diff --git a/src/crypto/mishmash/oid_sha256.c b/src/crypto/mishmash/oid_sha256.c
index 51ea585c5..963fddb63 100644
--- a/src/crypto/mishmash/oid_sha256.c
+++ b/src/crypto/mishmash/oid_sha256.c
@@ -33,5 +33,5 @@ static uint8_t oid_sha256[] = { ASN1_OID_SHA256 };
struct asn1_algorithm oid_sha256_algorithm __asn1_algorithm = {
.name = "sha256",
.digest = &sha256_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha256 ),
+ .oid = ASN1_CURSOR ( oid_sha256 ),
};
diff --git a/src/crypto/mishmash/oid_sha384.c b/src/crypto/mishmash/oid_sha384.c
index 5ba4d60a4..81ff48bbf 100644
--- a/src/crypto/mishmash/oid_sha384.c
+++ b/src/crypto/mishmash/oid_sha384.c
@@ -33,5 +33,5 @@ static uint8_t oid_sha384[] = { ASN1_OID_SHA384 };
struct asn1_algorithm oid_sha384_algorithm __asn1_algorithm = {
.name = "sha384",
.digest = &sha384_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha384 ),
+ .oid = ASN1_CURSOR ( oid_sha384 ),
};
diff --git a/src/crypto/mishmash/oid_sha512.c b/src/crypto/mishmash/oid_sha512.c
index 38e3c1a3d..78bae48b4 100644
--- a/src/crypto/mishmash/oid_sha512.c
+++ b/src/crypto/mishmash/oid_sha512.c
@@ -33,5 +33,5 @@ static uint8_t oid_sha512[] = { ASN1_OID_SHA512 };
struct asn1_algorithm oid_sha512_algorithm __asn1_algorithm = {
.name = "sha512",
.digest = &sha512_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha512 ),
+ .oid = ASN1_CURSOR ( oid_sha512 ),
};
diff --git a/src/crypto/mishmash/oid_sha512_224.c b/src/crypto/mishmash/oid_sha512_224.c
index 2300dad66..6f61f9cac 100644
--- a/src/crypto/mishmash/oid_sha512_224.c
+++ b/src/crypto/mishmash/oid_sha512_224.c
@@ -33,5 +33,5 @@ static uint8_t oid_sha512_224[] = { ASN1_OID_SHA512_224 };
struct asn1_algorithm oid_sha512_224_algorithm __asn1_algorithm = {
.name = "sha512/224",
.digest = &sha512_224_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha512_224 ),
+ .oid = ASN1_CURSOR ( oid_sha512_224 ),
};
diff --git a/src/crypto/mishmash/oid_sha512_256.c b/src/crypto/mishmash/oid_sha512_256.c
index 6af61fea9..bce4762e4 100644
--- a/src/crypto/mishmash/oid_sha512_256.c
+++ b/src/crypto/mishmash/oid_sha512_256.c
@@ -33,5 +33,5 @@ static uint8_t oid_sha512_256[] = { ASN1_OID_SHA512_256 };
struct asn1_algorithm oid_sha512_256_algorithm __asn1_algorithm = {
.name = "sha512/256",
.digest = &sha512_256_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha512_256 ),
+ .oid = ASN1_CURSOR ( oid_sha512_256 ),
};
diff --git a/src/crypto/mishmash/rsa_md5.c b/src/crypto/mishmash/rsa_md5.c
index ac828ac11..051afe264 100644
--- a/src/crypto/mishmash/rsa_md5.c
+++ b/src/crypto/mishmash/rsa_md5.c
@@ -36,7 +36,7 @@ struct asn1_algorithm md5_with_rsa_encryption_algorithm __asn1_algorithm = {
.name = "md5WithRSAEncryption",
.pubkey = &rsa_algorithm,
.digest = &md5_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_md5_with_rsa_encryption ),
+ .oid = ASN1_CURSOR ( oid_md5_with_rsa_encryption ),
};
/** MD5 digestInfo prefix */
diff --git a/src/crypto/mishmash/rsa_sha1.c b/src/crypto/mishmash/rsa_sha1.c
index 39424bf2d..264f871f1 100644
--- a/src/crypto/mishmash/rsa_sha1.c
+++ b/src/crypto/mishmash/rsa_sha1.c
@@ -37,7 +37,7 @@ struct asn1_algorithm sha1_with_rsa_encryption_algorithm __asn1_algorithm = {
.name = "sha1WithRSAEncryption",
.pubkey = &rsa_algorithm,
.digest = &sha1_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha1_with_rsa_encryption ),
+ .oid = ASN1_CURSOR ( oid_sha1_with_rsa_encryption ),
};
/** SHA-1 digestInfo prefix */
diff --git a/src/crypto/mishmash/rsa_sha224.c b/src/crypto/mishmash/rsa_sha224.c
index 5e8755aab..1465a033d 100644
--- a/src/crypto/mishmash/rsa_sha224.c
+++ b/src/crypto/mishmash/rsa_sha224.c
@@ -37,7 +37,7 @@ struct asn1_algorithm sha224_with_rsa_encryption_algorithm __asn1_algorithm = {
.name = "sha224WithRSAEncryption",
.pubkey = &rsa_algorithm,
.digest = &sha224_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha224_with_rsa_encryption ),
+ .oid = ASN1_CURSOR ( oid_sha224_with_rsa_encryption ),
};
/** SHA-224 digestInfo prefix */
diff --git a/src/crypto/mishmash/rsa_sha256.c b/src/crypto/mishmash/rsa_sha256.c
index b44af5f19..7283c3e29 100644
--- a/src/crypto/mishmash/rsa_sha256.c
+++ b/src/crypto/mishmash/rsa_sha256.c
@@ -37,7 +37,7 @@ struct asn1_algorithm sha256_with_rsa_encryption_algorithm __asn1_algorithm = {
.name = "sha256WithRSAEncryption",
.pubkey = &rsa_algorithm,
.digest = &sha256_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha256_with_rsa_encryption ),
+ .oid = ASN1_CURSOR ( oid_sha256_with_rsa_encryption ),
};
/** SHA-256 digestInfo prefix */
diff --git a/src/crypto/mishmash/rsa_sha384.c b/src/crypto/mishmash/rsa_sha384.c
index af22a2bf0..6f8c29b29 100644
--- a/src/crypto/mishmash/rsa_sha384.c
+++ b/src/crypto/mishmash/rsa_sha384.c
@@ -37,7 +37,7 @@ struct asn1_algorithm sha384_with_rsa_encryption_algorithm __asn1_algorithm = {
.name = "sha384WithRSAEncryption",
.pubkey = &rsa_algorithm,
.digest = &sha384_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha384_with_rsa_encryption ),
+ .oid = ASN1_CURSOR ( oid_sha384_with_rsa_encryption ),
};
/** SHA-384 digestInfo prefix */
diff --git a/src/crypto/mishmash/rsa_sha512.c b/src/crypto/mishmash/rsa_sha512.c
index 29ee15493..bb4463a5a 100644
--- a/src/crypto/mishmash/rsa_sha512.c
+++ b/src/crypto/mishmash/rsa_sha512.c
@@ -37,7 +37,7 @@ struct asn1_algorithm sha512_with_rsa_encryption_algorithm __asn1_algorithm = {
.name = "sha512WithRSAEncryption",
.pubkey = &rsa_algorithm,
.digest = &sha512_algorithm,
- .oid = ASN1_OID_CURSOR ( oid_sha512_with_rsa_encryption ),
+ .oid = ASN1_CURSOR ( oid_sha512_with_rsa_encryption ),
};
/** SHA-512 digestInfo prefix */