diff options
| -rw-r--r-- | src/include/ipxe/asn1.h | 91 | ||||
| -rw-r--r-- | src/include/ipxe/rsa.h | 75 | ||||
| -rw-r--r-- | src/include/ipxe/x509.h | 16 |
3 files changed, 91 insertions, 91 deletions
diff --git a/src/include/ipxe/asn1.h b/src/include/ipxe/asn1.h index be344c9cb..064f2a99c 100644 --- a/src/include/ipxe/asn1.h +++ b/src/include/ipxe/asn1.h @@ -91,6 +91,97 @@ struct asn1_cursor { /** ASN.1 OID for joint-iso-itu-t(2) country(16) */ #define ASN1_OID_COUNTRY ASN1_OID_INITIAL ( 2, 16 ) +/** ASN.1 OID for iso(1) member-body(2) us(840) */ +#define ASN1_OID_ISO_US ASN1_OID_ISO_MEMBERBODY, ASN1_OID_DOUBLE ( 840 ) + +/** ASN.1 OID for iso(1) member-body(2) us(840) rsadsi(113549) */ +#define ASN1_OID_RSADSI ASN1_OID_ISO_US, ASN1_OID_TRIPLE ( 113549 ) + +/** ASN.1 OID for iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) */ +#define ASN1_OID_PKCS ASN1_OID_RSADSI, ASN1_OID_SINGLE ( 1 ) + +/** ASN.1 OID for iso(1) member-body(2) us(840) rsadsi(113549) + * digestAlgorithm(2) + */ +#define ASN1_OID_DIGESTALGORITHM ASN1_OID_RSADSI, ASN1_OID_SINGLE ( 2 ) + +/** ASN.1 OID for iso(1) identified-organization(3) oiw(14) */ +#define ASN1_OID_OIW ASN1_OID_IDENTIFIED_ORGANIZATION, ASN1_OID_SINGLE ( 14 ) + +/** ASN.1 OID for iso(1) identified-organization(3) oiw(14) secsig(3) */ +#define ASN1_OID_SECSIG ASN1_OID_OIW, ASN1_OID_SINGLE ( 3 ) + +/** ASN1. OID for iso(1) identified-organization(3) oiw(14) secsig(3) + * algorithms(2) + */ +#define ASN1_OID_SECSIG_ALGORITHMS ASN1_OID_SECSIG, ASN1_OID_SINGLE ( 2 ) + +/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) */ +#define ASN1_OID_COUNTRY_US ASN1_OID_COUNTRY, ASN1_OID_DOUBLE ( 840 ) + +/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) organization(1) */ +#define ASN1_OID_US_ORGANIZATION ASN1_OID_COUNTRY_US, ASN1_OID_SINGLE ( 1 ) + +/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) + * organization(1) gov(101) + */ +#define ASN1_OID_US_GOV ASN1_OID_US_ORGANIZATION, ASN1_OID_SINGLE ( 101 ) + +/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) + * organization(1) gov(101) csor(3) + */ +#define ASN1_OID_CSOR ASN1_OID_US_GOV, ASN1_OID_SINGLE ( 3 ) + +/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) + * organization(1) gov(101) csor(3) nistalgorithm(4) + */ +#define ASN1_OID_NISTALGORITHM ASN1_OID_CSOR, ASN1_OID_SINGLE ( 4 ) + +/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) + * organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) + */ +#define ASN1_OID_HASHALGS ASN1_OID_NISTALGORITHM, ASN1_OID_SINGLE ( 2 ) + +/** ASN.1 OID for pkcs-1 */ +#define ASN1_OID_PKCS_1 ASN1_OID_PKCS, ASN1_OID_SINGLE ( 1 ) + +/** ASN.1 OID for rsaEncryption */ +#define ASN1_OID_RSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 1 ) + +/** ASN.1 OID for md5WithRSAEncryption */ +#define ASN1_OID_MD5WITHRSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 4 ) + +/** ASN.1 OID for sha1WithRSAEncryption */ +#define ASN1_OID_SHA1WITHRSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 5 ) + +/** ASN.1 OID for sha256WithRSAEncryption */ +#define ASN1_OID_SHA256WITHRSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 11 ) + +/** ASN.1 OID for id-md5 */ +#define ASN1_OID_MD5 ASN1_OID_DIGESTALGORITHM, ASN1_OID_SINGLE ( 5 ) + +/** ASN.1 OID for id-sha1 */ +#define ASN1_OID_SHA1 ASN1_OID_SECSIG_ALGORITHMS, ASN1_OID_SINGLE ( 26 ) + +/** ASN.1 OID for id-sha256 */ +#define ASN1_OID_SHA256 ASN1_OID_HASHALGS, ASN1_OID_SINGLE ( 1 ) + +/** ASN.1 OID for joint-iso-itu-t(2) ds(5) attributeType(4) */ +#define ASN1_OID_ATTRIBUTE_TYPE \ + ASN1_OID_DIRECTORY_SERVICES, ASN1_OID_SINGLE ( 4 ) + +/** ASN.1 OID for joint-iso-itu-t(2) ds(5) attributeType(4) commonName(3) */ +#define ASN1_OID_COMMON_NAME ASN1_OID_ATTRIBUTE_TYPE, ASN1_OID_SINGLE ( 3 ) + +/** ASN.1 OID for id-ce */ +#define ASN1_OID_CE ASN1_OID_DIRECTORY_SERVICES, ASN1_OID_SINGLE ( 29 ) + +/** ASN.1 OID for id-ce-keyUsage */ +#define ASN1_OID_KEYUSAGE ASN1_OID_CE, ASN1_OID_SINGLE ( 15 ) + +/** ASN.1 OID for id-ce-basicConstraints */ +#define ASN1_OID_BASICCONSTRAINTS ASN1_OID_CE, ASN1_OID_SINGLE ( 19 ) + /** Define an ASN.1 cursor containing an OID */ #define ASN1_OID_CURSOR( oid_value ) { \ .data = oid_value, \ diff --git a/src/include/ipxe/rsa.h b/src/include/ipxe/rsa.h index d43d336ab..1a5ad8bab 100644 --- a/src/include/ipxe/rsa.h +++ b/src/include/ipxe/rsa.h @@ -13,81 +13,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/asn1.h> #include <ipxe/tables.h> -/** ASN.1 OID for iso(1) member-body(2) us(840) */ -#define ASN1_OID_ISO_US ASN1_OID_ISO_MEMBERBODY, ASN1_OID_DOUBLE ( 840 ) - -/** ASN.1 OID for iso(1) member-body(2) us(840) rsadsi(113549) */ -#define ASN1_OID_RSADSI ASN1_OID_ISO_US, ASN1_OID_TRIPLE ( 113549 ) - -/** ASN.1 OID for iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) */ -#define ASN1_OID_PKCS ASN1_OID_RSADSI, ASN1_OID_SINGLE ( 1 ) - -/** ASN.1 OID for iso(1) member-body(2) us(840) rsadsi(113549) - * digestAlgorithm(2) - */ -#define ASN1_OID_DIGESTALGORITHM ASN1_OID_RSADSI, ASN1_OID_SINGLE ( 2 ) - -/** ASN.1 OID for iso(1) identified-organization(3) oiw(14) */ -#define ASN1_OID_OIW ASN1_OID_IDENTIFIED_ORGANIZATION, ASN1_OID_SINGLE ( 14 ) - -/** ASN.1 OID for iso(1) identified-organization(3) oiw(14) secsig(3) */ -#define ASN1_OID_SECSIG ASN1_OID_OIW, ASN1_OID_SINGLE ( 3 ) - -/** ASN1. OID for iso(1) identified-organization(3) oiw(14) secsig(3) - * algorithms(2) - */ -#define ASN1_OID_SECSIG_ALGORITHMS ASN1_OID_SECSIG, ASN1_OID_SINGLE ( 2 ) - -/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) */ -#define ASN1_OID_COUNTRY_US ASN1_OID_COUNTRY, ASN1_OID_DOUBLE ( 840 ) - -/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) organization(1) */ -#define ASN1_OID_US_ORGANIZATION ASN1_OID_COUNTRY_US, ASN1_OID_SINGLE ( 1 ) - -/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) - * organization(1) gov(101) - */ -#define ASN1_OID_US_GOV ASN1_OID_US_ORGANIZATION, ASN1_OID_SINGLE ( 101 ) - -/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) - * organization(1) gov(101) csor(3) - */ -#define ASN1_OID_CSOR ASN1_OID_US_GOV, ASN1_OID_SINGLE ( 3 ) - -/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) - * organization(1) gov(101) csor(3) nistalgorithm(4) - */ -#define ASN1_OID_NISTALGORITHM ASN1_OID_CSOR, ASN1_OID_SINGLE ( 4 ) - -/** ASN.1 OID for joint-iso-itu-t(2) country(16) us(840) - * organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) - */ -#define ASN1_OID_HASHALGS ASN1_OID_NISTALGORITHM, ASN1_OID_SINGLE ( 2 ) - -/** ASN.1 OID for pkcs-1 */ -#define ASN1_OID_PKCS_1 ASN1_OID_PKCS, ASN1_OID_SINGLE ( 1 ) - -/** ASN.1 OID for rsaEncryption */ -#define ASN1_OID_RSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 1 ) - -/** ASN.1 OID for md5WithRSAEncryption */ -#define ASN1_OID_MD5WITHRSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 4 ) - -/** ASN.1 OID for sha1WithRSAEncryption */ -#define ASN1_OID_SHA1WITHRSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 5 ) - -/** ASN.1 OID for sha256WithRSAEncryption */ -#define ASN1_OID_SHA256WITHRSAENCRYPTION ASN1_OID_PKCS_1, ASN1_OID_SINGLE ( 11 ) - -/** ASN.1 OID for id-md5 */ -#define ASN1_OID_MD5 ASN1_OID_DIGESTALGORITHM, ASN1_OID_SINGLE ( 5 ) - -/** ASN.1 OID for id-sha1 */ -#define ASN1_OID_SHA1 ASN1_OID_SECSIG_ALGORITHMS, ASN1_OID_SINGLE ( 26 ) - -/** ASN.1 OID for id-sha256 */ -#define ASN1_OID_SHA256 ASN1_OID_HASHALGS, ASN1_OID_SINGLE ( 1 ) - /** RSA digestAlgorithm sequence contents */ #define RSA_DIGESTALGORITHM_CONTENTS( ... ) \ ASN1_OID, VA_ARG_COUNT ( __VA_ARGS__ ), __VA_ARGS__, \ diff --git a/src/include/ipxe/x509.h b/src/include/ipxe/x509.h index 925e23f7d..89f90b844 100644 --- a/src/include/ipxe/x509.h +++ b/src/include/ipxe/x509.h @@ -14,22 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <time.h> #include <ipxe/asn1.h> -/** ASN.1 OID for joint-iso-itu-t(2) ds(5) attributeType(4) */ -#define ASN1_OID_ATTRIBUTE_TYPE \ - ASN1_OID_DIRECTORY_SERVICES, ASN1_OID_SINGLE ( 4 ) - -/** ASN.1 OID for joint-iso-itu-t(2) ds(5) attributeType(4) commonName(3) */ -#define ASN1_OID_COMMON_NAME ASN1_OID_ATTRIBUTE_TYPE, ASN1_OID_SINGLE ( 3 ) - -/** ASN.1 OID for id-ce */ -#define ASN1_OID_CE ASN1_OID_DIRECTORY_SERVICES, ASN1_OID_SINGLE ( 29 ) - -/** ASN.1 OID for id-ce-keyUsage */ -#define ASN1_OID_KEYUSAGE ASN1_OID_CE, ASN1_OID_SINGLE ( 15 ) - -/** ASN.1 OID for id-ce-basicConstraints */ -#define ASN1_OID_BASICCONSTRAINTS ASN1_OID_CE, ASN1_OID_SINGLE ( 19 ) - /** An X.509 algorithm */ struct x509_algorithm { /** Name */ |