Addition of generic NIST-DSA PKEY and ASN1 to support ML-DSA

crypto/CMakeLists.txt

@@ -323,9 +323,10 @@ if(ENABLE_DILITHIUM)
   set(
     DILITHIUM_SOURCES
 
-    dilithium/p_dilithium3.c
-    dilithium/p_dilithium3_asn1.c
-    dilithium/sig_dilithium3.c
+    dilithium/pqdsa.c
+    dilithium/p_pqdsa.c
+    dilithium/p_pqdsa_asn1.c
+    dilithium/ml_dsa.c
   )
 endif()
 
@@ -774,7 +775,7 @@ if(BUILD_TESTING)
     ecdh_extra/ecdh_test.cc
     dh_extra/dh_test.cc
     digest_extra/digest_test.cc
-    dilithium/p_dilithium_test.cc
+    dilithium/p_pqdsa_test.cc
     dsa/dsa_test.cc
     des/des_test.cc
     endian_test.cc

crypto/dilithium/internal.h

@@ -0,0 +1,71 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0 OR ISC
+
+#ifndef AWSLC_HEADER_PQDSA_INTERNAL_H
+#define AWSLC_HEADER_PQDSA_INTERNAL_H
+
+#include <openssl/base.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+// PQDSA_METHOD structure and helper functions.
+typedef struct {
+  int (*keygen)(uint8_t *public_key,
+                uint8_t *private_key);
+
+  int (*sign)(const uint8_t *private_key,
+              uint8_t *sig,
+              size_t *sig_len,
+              const uint8_t *message,
+              size_t message_len,
+              const uint8_t *ctx_string,
+              size_t ctx_string_len);
+
+  int (*verify)(const uint8_t *public_key,
+                const uint8_t *sig,
+                size_t sig_len,
+                const uint8_t *message,
+                size_t message_len,
+                const uint8_t *ctx_string,
+                size_t ctx_string_len);
+
+} PQDSA_METHOD;
+
+// PQDSA structure and helper functions.
+typedef struct {
+  int nid;
+  const uint8_t *oid;
+  uint8_t oid_len;
+  const char *comment;
+  size_t public_key_len;
+  size_t private_key_len;
+  size_t signature_len;
+  size_t keygen_seed_len;
+  size_t sign_seed_len;
+  const PQDSA_METHOD *method;
+} PQDSA;
+
+// PQDSA_KEY structure and helper functions.
+struct pqdsa_key_st {
+  const PQDSA *pqdsa;
+  uint8_t *public_key;
+  uint8_t *private_key;
+};
+
+int PQDSA_KEY_init(PQDSA_KEY *key, const PQDSA *pqdsa);
+const PQDSA * PQDSA_find_dsa_by_nid(int nid);
+const EVP_PKEY_ASN1_METHOD *PQDSA_find_asn1_by_nid(int nid);
+const PQDSA *PQDSA_KEY_get0_dsa(PQDSA_KEY* key);
+PQDSA_KEY *PQDSA_KEY_new(void);
+void PQDSA_KEY_free(PQDSA_KEY *key);
+int EVP_PKEY_pqdsa_set_params(EVP_PKEY *pkey, int nid);
+
+int PQDSA_KEY_set_raw_public_key(PQDSA_KEY *key, const uint8_t *in);
+int PQDSA_KEY_set_raw_private_key(PQDSA_KEY *key, const uint8_t *in);
+#if defined(__cplusplus)
+}  // extern C
+#endif
+
+#endif // AWSLC_HEADER_DSA_TEST_INTERNAL_H

crypto/dilithium/sig_dilithium3.c → crypto/dilithium/ml_dsa.c

@@ -1,8 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
+
 #include "../evp_extra/internal.h"
 #include "../fipsmodule/evp/internal.h"
-#include "sig_dilithium.h"
+#include "ml_dsa.h"
 #include "pqcrystals_dilithium_ref_common/sign.h"
 #include "pqcrystals_dilithium_ref_common/params.h"
 
@@ -20,39 +21,39 @@
 #include "./pqcrystals_dilithium_ref_common/symmetric-shake.c"
 
 // Note: These methods currently default to using the reference code for
-// Dilithium. In a future where AWS-LC has optimized options available,
+// ML-DSA. In a future where AWS-LC has optimized options available,
 // those can be conditionally (or based on compile-time flags) called here,
 // depending on platform support.
 
-int ml_dsa_65_keypair(uint8_t *public_key  /* OUT */,
-                       uint8_t *secret_key /* OUT */) {
+int ml_dsa_65_keypair(uint8_t *public_key   /* OUT */,
+                      uint8_t *private_key  /* OUT */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
-  return crypto_sign_keypair(&params, public_key, secret_key);
+  return (crypto_sign_keypair(&params, public_key, private_key) == 0);
 }
 
-int ml_dsa_65_sign(uint8_t *sig                /* OUT */,
-                    size_t *sig_len            /* OUT */,
-                    const uint8_t *message     /* IN */,
-                    size_t message_len         /* IN */,
-                    const uint8_t *ctx         /* IN */,
-                    size_t ctx_len             /* IN */,
-                    const uint8_t *secret_key  /* IN */) {
+int ml_dsa_65_sign(const uint8_t *private_key /* IN */,
+                   uint8_t *sig               /* OUT */,
+                   size_t *sig_len            /* OUT */,
+                   const uint8_t *message     /* IN */,
+                   size_t message_len         /* IN */,
+                   const uint8_t *ctx_string  /* IN */,
+                   size_t ctx_string_len      /* IN */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
   return crypto_sign_signature(&params, sig, sig_len, message, message_len,
-                                             ctx, ctx_len, secret_key);
+                               ctx_string, ctx_string_len, private_key) == 0;
 }
 
-int ml_dsa_65_verify(const uint8_t *message     /* IN */,
-                      size_t message_len        /* IN */,
-                      const uint8_t *sig        /* IN */,
-                      size_t sig_len            /* IN */,
-                      const uint8_t *ctx        /* IN */,
-                      size_t ctx_len            /* IN */,
-                      const uint8_t *public_key /* IN */) {
+int ml_dsa_65_verify(const uint8_t *public_key /* IN */,
+                     const uint8_t *sig        /* IN */,
+                     size_t sig_len            /* IN */,
+                     const uint8_t *message    /* IN */,
+                     size_t message_len        /* IN */,
+                     const uint8_t *ctx_string /* IN */,
+                     size_t ctx_string_len     /* IN */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
   return crypto_sign_verify(&params, sig, sig_len, message, message_len,
-                                          ctx, ctx_len, public_key);
+                            ctx_string, ctx_string_len, public_key) == 0;
 }

crypto/dilithium/ml_dsa.h

@@ -0,0 +1,36 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0 OR ISC
+
+#ifndef ML_DSA_H
+#define ML_DSA_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <openssl/base.h>
+#include <openssl/evp.h>
+
+#define MLDSA65_PUBLIC_KEY_BYTES 1952
+#define MLDSA65_PRIVATE_KEY_BYTES 4032
+#define MLDSA65_SIGNATURE_BYTES 3309
+#define MLDSA65_KEYGEN_SEED_BYTES 32
+#define MLDSA65_SIGNATURE_SEED_BYTES 32
+
+int ml_dsa_65_keypair(uint8_t *public_key,
+                      uint8_t *private_key);
+
+int ml_dsa_65_sign(const uint8_t *private_key,
+                   uint8_t *sig,
+                   size_t *sig_len,
+                   const uint8_t *message,
+                   size_t message_len,
+                   const uint8_t *ctx_string,
+                   size_t ctx_string_len);
+
+int ml_dsa_65_verify(const uint8_t *public_key,
+                     const uint8_t *sig,
+                     size_t sig_len,
+                     const uint8_t *message,
+                     size_t message_len,
+                     const uint8_t *ctx_string,
+                     size_t ctx_string_len);
+#endif