mirror of
https://github.com/ipxe/ipxe
synced 2026-04-16 03:00:10 +03:00
[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>
This commit is contained in:
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 ),
|
||||
};
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user