1 files changed, 171 insertions, 15 deletions

diff --git a/src/regress/lib/libcrypto/x509/x509_asn1.c b/src/regress/lib/libcrypto/x509/x509_asn1.c
index b6b251f104..ed50bc6177 100644
--- a/src/regress/lib/libcrypto/x509/x509_asn1.c
+++ b/src/regress/lib/libcrypto/x509/x509_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_asn1.c,v 1.8 2023/04/26 21:30:12 job Exp $ */
+/* $OpenBSD: x509_asn1.c,v 1.9 2023/04/26 22:05:36 job Exp $ */
 /*
  * Copyright (c) 2023 Job Snijders <job@openbsd.org>
  *
@@ -40,6 +40,10 @@ static const struct fnnames {
         { "X509_set_notBefore", X509_set_notBefore },
         { "X509_set_notAfter", X509_set_notAfter },
         { "X509_set_pubkey", X509_set_pubkey },
+        { "X509_CRL_set_version", X509_CRL_set_version },
+        { "X509_CRL_set_issuer_name", X509_CRL_set_issuer_name },
+        { "X509_CRL_set_lastUpdate", X509_CRL_set_lastUpdate },
+        { "X509_CRL_set_nextUpdate", X509_CRL_set_nextUpdate },
         { NULL, NULL }
 };
 
@@ -145,15 +149,91 @@ x509_compare(char *f, X509 *a, const unsigned char *der, long dersz)
         return rc;
 }
 
-int
-main(void)
+static void
+x509_crl_setup(unsigned char **der, unsigned char **der2, X509_CRL **xc,
+    long dersz, long *der2sz)
+{
+        const unsigned char *cpder;
+
+        cpder = *der;
+        if ((*xc = d2i_X509_CRL(NULL, &cpder, dersz)) == NULL)
+                errx(1, "d2i_X509");
+        if ((*der2sz = i2d_X509_CRL(*xc, der2)) <= 0)
+                errx(1, "i2d_X509");
+}
+
+static void
+x509_crl_cleanup(X509_CRL **xc, unsigned char **der)
+{
+        X509_CRL_free(*xc);
+        *xc = NULL;
+        free(*der);
+        *der = NULL;
+}
+
+static void
+x509_crl_set_name(int (*f)(X509_CRL *, X509_NAME *), X509_CRL **xc,
+    const unsigned char *n)
+{
+        X509_NAME *xn;
+
+        if ((xn = X509_NAME_new()) == NULL)
+                err(1, NULL);
+        if (!X509_NAME_add_entry_by_txt(xn, "C", MBSTRING_ASC, n, -1, -1, 0))
+                errx(1, "X509_NAME_add_entry_by_txt");
+        if (!f(*xc, xn))
+                lookup_and_err(f);
+
+        X509_NAME_free(xn);
+}
+
+static void
+x509_crl_set_time(int (*f)(X509_CRL *, const ASN1_TIME *), X509_CRL **xc, int t)
+{
+        ASN1_TIME *at;
+
+        if ((at = ASN1_TIME_new()) == NULL)
+                err(1, NULL);
+        if ((at = X509_gmtime_adj(NULL, t)) == NULL)
+                errx(1, "X509_gmtime_adj");
+        if (!f(*xc, at))
+                lookup_and_err(f);
+
+        ASN1_TIME_free(at);
+}
+
+static int
+x509_crl_compare(char *f, X509_CRL *ac, const unsigned char *der, long dersz)
+{
+        unsigned char *der_test = NULL;
+        long der_testsz;
+        int rc = 0;
+
+        if ((der_testsz = i2d_X509_CRL(ac, &der_test)) <= 0)
+                errx(1, "i2d_X509_CRL");
+
+        if (dersz == der_testsz) {
+                if (memcmp(der, der_test, dersz) == 0) {
+                        warnx("%s() didn't invalidate DER cache", f);
+                        rc = 1;
+                } else
+                        warnx("%s() OK", f);
+        } else
+                warnx("%s() OK", f);
+
+        free(der_test);
+        return rc;
+}
+
+static int
+test_x509_setters(void)
 {
         EVP_PKEY *pkey = NULL;
         EVP_PKEY_CTX *pkey_ctx = NULL;
         X509 *a, *x;
         unsigned char *der = NULL, *der2 = NULL;
         long dersz, der2sz;
-        int ret = 0;
+        int failed = 0;
 
         if ((x = X509_new()) == NULL)
                 err(1, NULL);
@@ -185,37 +265,37 @@ main(void)
         x509_setup(&der, &der2, &a, dersz, &der2sz);
         if (!X509_set_version(a, 2))
                 errx(1, "X509_set_version");
-        ret += x509_compare("X509_set_version", a, der2, der2sz);
+        failed |= x509_compare("X509_set_version", a, der2, der2sz);
         x509_cleanup(&a, &der2);
 
         /* test X509_set_serialNumber */
         x509_setup(&der, &der2, &a, dersz, &der2sz);
         x509_set_integer(X509_set_serialNumber, &a, 2);
-        ret += x509_compare("X509_set_serialNumber", a, der2, der2sz);
+        failed |= x509_compare("X509_set_serialNumber", a, der2, der2sz);
         x509_cleanup(&a, &der2);
 
         /* test X509_set_issuer_name */
         x509_setup(&der, &der2, &a, dersz, &der2sz);
         x509_set_name(X509_set_issuer_name, &a, "DE");
-        ret += x509_compare("X509_set_issuer_name", a, der2, der2sz);
+        failed |= x509_compare("X509_set_issuer_name", a, der2, der2sz);
         x509_cleanup(&a, &der2);
 
         /* test X509_set_subject_name */
         x509_setup(&der, &der2, &a, dersz, &der2sz);
         x509_set_name(X509_set_subject_name, &a, "FR");
-        ret += x509_compare("X509_set_subject_name", a, der2, der2sz);
+        failed |= x509_compare("X509_set_subject_name", a, der2, der2sz);
         x509_cleanup(&a, &der2);
 
         /* test X509_set_notBefore */
         x509_setup(&der, &der2, &a, dersz, &der2sz);
         x509_set_time(X509_set_notBefore, &a, 120);
-        ret += x509_compare("X509_set_notBefore", a, der2, der2sz);
+        failed |= x509_compare("X509_set_notBefore", a, der2, der2sz);
         x509_cleanup(&a, &der2);
 
         /* test X509_set_notAfter */
         x509_setup(&der, &der2, &a, dersz, &der2sz);
         x509_set_time(X509_set_notAfter, &a, 180);
-        ret += x509_compare("X509_set_notAfter", a, der2, der2sz);
+        failed |= x509_compare("X509_set_notAfter", a, der2, der2sz);
         x509_cleanup(&a, &der2);
 
         /* test X509_set_pubkey */
@@ -226,13 +306,89 @@ main(void)
                 errx(1, "X509_set_pubkey");
         EVP_PKEY_CTX_free(pkey_ctx);
         EVP_PKEY_free(pkey);
-        ret += x509_compare("X509_set_pubkey", a, der2, der2sz);
-        x509_cleanup(&a, &der2);
+        pkey_ctx = NULL;
+        pkey = NULL;
+        failed |= x509_compare("X509_set_pubkey", a, der2, der2sz);
 
+        x509_cleanup(&a, &der2);
         X509_free(x);
         free(der);
 
-        if (ret)
-                return 1;
-        return 0;
+        return failed;
+}
+
+static int
+test_x509_crl_setters(void)
+{
+        EVP_PKEY *pkey = NULL;
+        EVP_PKEY_CTX *pkey_ctx = NULL;
+        X509_CRL *ac, *xc;
+        unsigned char *der = NULL, *der2 = NULL;
+        long dersz, der2sz;
+        int failed = 0;
+
+        if ((xc = X509_CRL_new()) == NULL)
+                err(1, NULL);
+
+        if ((pkey_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL)) == NULL)
+                errx(1, "EVP_PKEY_CTX_new_id");
+        if (EVP_PKEY_keygen_init(pkey_ctx) != 1)
+                errx(1, "EVP_PKEY_keygen_init");
+        if (EVP_PKEY_CTX_set_rsa_keygen_bits(pkey_ctx, 2048) <= 0)
+                errx(1, "EVP_PKEY_CTX_set_rsa_keygen_bits");
+        if (EVP_PKEY_keygen(pkey_ctx, &pkey) <= 0)
+                errx(1, "EVP_PKEY_keygen");
+
+        x509_crl_set_time(X509_CRL_set_lastUpdate, &xc, 0);
+        x509_crl_set_time(X509_CRL_set_nextUpdate, &xc, 60);
+        x509_crl_set_name(X509_CRL_set_issuer_name, &xc, "NL");
+
+        // one time creation of the original DER
+        if (!X509_CRL_sign(xc, pkey, EVP_sha256()))
+                errx(1, "X509_CRL_sign");
+        EVP_PKEY_free(pkey);
+        EVP_PKEY_CTX_free(pkey_ctx);
+        if ((dersz = i2d_X509_CRL(xc, &der)) <= 0)
+                errx(1, "i2d_X509_CRL");
+
+        /* test X509_CRL_set_version */
+        x509_crl_setup(&der, &der2, &ac, dersz, &der2sz);
+        if (!X509_CRL_set_version(ac, 1))
+                errx(1, "X509_CRL_set_version");
+        failed |= x509_crl_compare("X509_CRL_set_version", ac, der2, der2sz);
+        x509_crl_cleanup(&ac, &der2);
+
+        /* test X509_CRL_set_issuer_name */
+        x509_crl_setup(&der, &der2, &ac, dersz, &der2sz);
+        x509_crl_set_name(X509_CRL_set_issuer_name, &ac, "DE");
+        failed |= x509_crl_compare("X509_CRL_set_issuer_name", ac, der2,
+            der2sz);
+        x509_crl_cleanup(&ac, &der2);
+
+        /* test X509_CRL_set_lastUpdate */
+        x509_crl_setup(&der, &der2, &ac, dersz, &der2sz);
+        x509_crl_set_time(X509_CRL_set_lastUpdate, &ac, 120);
+        failed |= x509_crl_compare("X509_set_notBefore", ac, der2, der2sz);
+        x509_crl_cleanup(&ac, &der2);
+
+        /* test X509_CRL_set_nextUpdate */
+        x509_crl_setup(&der, &der2, &ac, dersz, &der2sz);
+        x509_crl_set_time(X509_CRL_set_nextUpdate, &ac, 180);
+        failed |= x509_crl_compare("X509_set_notAfter", ac, der2, der2sz);
+        x509_crl_cleanup(&ac, &der2);
+
+        X509_CRL_free(xc);
+        free(der);
+
+        return failed;
+}
+
+int main(void)
+{
+        int failed = 0;
+
+        failed |= test_x509_setters();
+        /* failed |= */ test_x509_crl_setters();
+
+        return failed;
 }