x509: Translate attribute types into x509_rdn_type_t

Author: lmb

include/asinine/asn1.h

@@ -42,14 +42,15 @@ typedef enum asinine_err {
 	ASININE_ERR_UNSUPPORTED_NAME       = 35,
 	ASININE_ERR_UNSUPPORTED_CONSTRAINT = 36,
 	ASININE_ERR_INVALID                = 40,
-	ASININE_ERR_INVALID_UNTRUSTED      = 41,
-	ASININE_ERR_INVALID_EXPIRED        = 42,
-	ASININE_ERR_INVALID_ALGORITHM      = 43,
-	ASININE_ERR_INVALID_ISSUER         = 44,
-	ASININE_ERR_INVALID_VERSION        = 45,
-	ASININE_ERR_INVALID_NOT_CA         = 46,
-	ASININE_ERR_INVALID_PATH_LEN       = 47,
-	ASININE_ERR_INVALID_KEYUSE         = 48,
+	ASININE_ERR_INVALID_EXPIRED        = 41,
+	ASININE_ERR_INVALID_ALGORITHM      = 42,
+	ASININE_ERR_INVALID_ISSUER         = 43,
+	ASININE_ERR_INVALID_VERSION        = 44,
+	ASININE_ERR_INVALID_NOT_CA         = 45,
+	ASININE_ERR_INVALID_PATH_LEN       = 46,
+	ASININE_ERR_INVALID_KEYUSE         = 47,
+	ASININE_ERR_UNTRUSTED_ISSUER       = 60,
+	ASININE_ERR_UNTRUSTED_SIGNATURE    = 61,
 	ASININE_ERR_DEPRECATED             = 70,
 } asinine_err_t;
 

include/asinine/x509.h

@@ -106,8 +106,31 @@ typedef enum x509_ext_keyuse {
 	X509_EXT_KEYUSE_ANY          = 63
 } x509_ext_keyuse_t;
 
+typedef enum x509_rdn_type {
+	X509_RDN_INVALID,
+	X509_RDN_JURISDICTION_COUNTRY,
+	X509_RDN_JURISDICTION_STATE_OR_PROVINCE,
+	X509_RDN_JURISDICTION_LOCALITY,
+	X509_RDN_COUNTRY,
+	X509_RDN_STATE_OR_PROVINCE,
+	X509_RDN_LOCALITY,
+	X509_RDN_POSTAL_CODE,
+	X509_RDN_STREET_ADDRESS,
+	X509_RDN_PO_BOX,
+	X509_RDN_BUSINESS_CATEGORY,
+	X509_RDN_ORGANIZATION,
+	X509_RDN_ORGANIZATIONAL_UNIT,
+	X509_RDN_ORGANIZATIONAL_ID,
+	X509_RDN_DISTINGUISHED_NAME,
+	X509_RDN_DISTINGUISHED_NAME_QUALIFIER,
+	X509_RDN_COMMON_NAME,
+	X509_RDN_SERIAL_NUMBER,
+	X509_RDN_SURNAME,
+	X509_RDN_EMAIL,
+} x509_rdn_type_t;
+
 typedef struct x509_rdn {
-	asn1_oid_t oid;
+	x509_rdn_type_t type;
 	asn1_token_t value;
 } x509_rdn_t;
 
@@ -154,18 +177,20 @@ typedef struct x509_cert {
 	int8_t path_len_constraint;
 } x509_cert_t;
 
-ASININE_API asinine_err_t x509_parse(asn1_parser_t *parser, x509_cert_t *cert);
+ASININE_API asinine_err_t x509_parse_cert(
+    asn1_parser_t *parser, x509_cert_t *cert);
 ASININE_API asinine_err_t x509_parse_name(
     asn1_parser_t *parser, x509_name_t *name);
 ASININE_API asinine_err_t x509_parse_optional_name(
     asn1_parser_t *parser, x509_name_t *name);
+ASININE_API asinine_err_t x509_parse_alt_names(
+    asn1_parser_t *parser, x509_alt_names_t *alt_names);
 ASININE_API asinine_err_t x509_parse_pubkey(asn1_parser_t *parser,
     x509_pubkey_t *pubkey, x509_pubkey_params_t *params, bool *has_params);
 ASININE_API void x509_sort_name(x509_name_t *name);
+ASININE_API const char *x509_rdn_type_string(x509_rdn_type_t type);
 ASININE_API bool x509_name_eq(
     const x509_name_t *a, const x509_name_t *b, const char **err);
-ASININE_API asinine_err_t x509_parse_alt_names(
-    asn1_parser_t *parser, x509_alt_names_t *alt_names);
 
 typedef asinine_err_t (*x509_validation_cb_t)(const x509_pubkey_t *pubkey,
     x509_pubkey_params_t params, const x509_signature_t *sig,

premake5.lua

@@ -51,4 +51,4 @@ workspace "Asinine"
 		language "C"
 		links { "asinine" }
 
-		files { "include/tests/*.h", "src/tests/*.c" }
+		files { "include/tests/*.h", "src/tests/*.c", "src/utils/load.c" }

src/asn1-oid.c

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -15,14 +16,14 @@
 #define OID_VALUE_MASK ((1 << 7) - 1)
 #define OID_VALUE_BITS_PER_BYTE 7
 
-static int
+static bool
 append_arc(asn1_oid_t *oid, asn1_oid_arc_t arc) {
 	if (oid->num >= ASN1_OID_MAXIMUM_DEPTH) {
-		return 0;
+		return false;
 	}
 
 	oid->arcs[oid->num++] = arc;
-	return 1;
+	return true;
 }
 
 // 8.19

src/asn1-types.c

@@ -445,17 +445,16 @@ asinine_strerror(asinine_err_t err) {
 		case_for_tag(ASININE_ERR_UNSUPPORTED_NAME);
 		case_for_tag(ASININE_ERR_UNSUPPORTED_CONSTRAINT);
 		case_for_tag(ASININE_ERR_INVALID);
-		case_for_tag(ASININE_ERR_INVALID_UNTRUSTED);
 		case_for_tag(ASININE_ERR_INVALID_EXPIRED);
 		case_for_tag(ASININE_ERR_INVALID_ALGORITHM);
 		case_for_tag(ASININE_ERR_INVALID_ISSUER);
 		case_for_tag(ASININE_ERR_INVALID_VERSION);
 		case_for_tag(ASININE_ERR_INVALID_NOT_CA);
 		case_for_tag(ASININE_ERR_INVALID_PATH_LEN);
 		case_for_tag(ASININE_ERR_INVALID_KEYUSE);
+		case_for_tag(ASININE_ERR_UNTRUSTED_ISSUER);
+		case_for_tag(ASININE_ERR_UNTRUSTED_SIGNATURE);
 		case_for_tag(ASININE_ERR_DEPRECATED);
-	default:
-		return "UNKNOWN";
 	}
 #undef case_for_tag
 }
@@ -471,8 +470,6 @@ class_to_string(asn1_class_t class) {
 		case_for(ASN1_CLASS_APPLICATION);
 		case_for(ASN1_CLASS_CONTEXT);
 		case_for(ASN1_CLASS_PRIVATE);
-	default:
-		return "UNKNOWN";
 	}
 #undef case_for
 }
@@ -483,7 +480,7 @@ tag_to_string(asn1_tag_t tag) {
 #define case_for(x) \
 	case x: \
 		return #x
-	switch ((asn1_tag_t)tag) {
+	switch (tag) {
 		case_for(ASN1_TAG_BOOL);
 		case_for(ASN1_TAG_INT);
 		case_for(ASN1_TAG_BITSTRING);
@@ -499,8 +496,6 @@ tag_to_string(asn1_tag_t tag) {
 		case_for(ASN1_TAG_UTCTIME);
 		case_for(ASN1_TAG_GENERALIZEDTIME);
 		case_for(ASN1_TAG_VISIBLESTRING);
-	default:
-		return "UNKNOWN";
 	}
 #undef case_for
 }