Openpgp functionality

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "crypto/salty"]
 	path = crypto/salty
 	url = https://github.com/ycrypto/salty.git
+[submodule "openpgp"]
+	path = openpgp
+	url = https://github.com/solokeys/openpgp.git

crypto/libsalty/salty.h

@@ -0,0 +1,120 @@
+#ifndef salty_h
+#define salty_h
+
+/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define salty_COMPRESSED_Y_LENGTH 32
+#define salty_PUBLICKEY_SERIALIZED_LENGTH 32
+#define salty_SCALAR_LENGTH 32
+#define salty_SECRETKEY_NONCE_LENGTH 32
+#define salty_SECRETKEY_SCALAR_LENGTH 32
+#define salty_SECRETKEY_SEED_LENGTH 32
+#define salty_SECRETKEY_SERIALIZED_LENGTH 32
+#define salty_SHA256_LENGTH 64
+#define salty_SHA512_LENGTH 64
+#define salty_SIGNATURE_SERIALIZED_LENGTH 64
+
+/**
+ * Extensible error type for all `salty` operations.
+ *
+ * This enum has a hidden member, to prevent exhaustively checking for errors.
+ */
+typedef enum {
+  /**
+   * Never occurs, simplifies C bindings
+   */
+  NoError = 0,
+  /**
+   * Bytes do not correspond to a canonical base field element
+   */
+  NonCanonicalFieldElement,
+  /**
+   * Public key bytes invalid
+   */
+  PublicKeyBytesInvalid,
+  /**
+   * Signature verification failed
+   */
+  SignatureInvalid,
+  /**
+   * Context for prehashed signatures too long
+   */
+  ContextTooLong,
+  _Extensible,
+} salty_Error;
+
+/**
+ * Generates a public key from a secret seed. Use to verify signatures.
+ */
+void salty_public_key(const uint8_t (*seed)[salty_SECRETKEY_SEED_LENGTH],
+                      uint8_t (*public_key)[salty_PUBLICKEY_SERIALIZED_LENGTH]);
+
+/**
+ * Signs the data, based on the keypair generated from the secret seed.
+ */
+void salty_sign(const uint8_t (*seed)[salty_SECRETKEY_SEED_LENGTH],
+                const uint8_t *data_ptr,
+                uintptr_t data_len,
+                uint8_t (*signature)[salty_SIGNATURE_SERIALIZED_LENGTH]);
+
+/**
+ * Signs the data for a context, based on the keypair generated from the secret seed.
+ */
+salty_Error salty_sign_with_context(const uint8_t (*seed)[salty_SECRETKEY_SEED_LENGTH],
+                                    const uint8_t *data_ptr,
+                                    uintptr_t data_len,
+                                    const uint8_t *context_ptr,
+                                    uintptr_t context_len,
+                                    uint8_t (*signature)[salty_SIGNATURE_SERIALIZED_LENGTH]);
+
+/**
+ * Signs the prehashed data, based on the keypair generated from the secret seed.
+ * An optional context can also be passed (this is recommended).
+ */
+salty_Error salty_sign_prehashed(const uint8_t (*seed)[salty_SECRETKEY_SEED_LENGTH],
+                                 const uint8_t (*prehashed_data)[salty_SHA512_LENGTH],
+                                 const uint8_t *context_ptr,
+                                 uintptr_t context_len,
+                                 uint8_t (*signature)[salty_SIGNATURE_SERIALIZED_LENGTH]);
+
+/**
+ * Verify a presumed signature on the given data.
+ */
+salty_Error salty_verify(const uint8_t (*public_key)[salty_PUBLICKEY_SERIALIZED_LENGTH],
+                         const uint8_t *data_ptr,
+                         uintptr_t data_len,
+                         const uint8_t (*signature)[salty_SIGNATURE_SERIALIZED_LENGTH]);
+
+/**
+ * Verify a presumed signature on the given data for a context.
+ */
+salty_Error salty_verify_with_context(const uint8_t (*public_key)[salty_PUBLICKEY_SERIALIZED_LENGTH],
+                                      const uint8_t *data_ptr,
+                                      uintptr_t data_len,
+                                      const uint8_t *context_ptr,
+                                      uintptr_t context_len,
+                                      const uint8_t (*signature)[salty_SIGNATURE_SERIALIZED_LENGTH]);
+
+/**
+ * Verify a presumed signature on the given data.
+ */
+salty_Error salty_verify_prehashed(const uint8_t (*public_key)[salty_PUBLICKEY_SERIALIZED_LENGTH],
+                                   const uint8_t (*prehashed_data)[salty_SHA512_LENGTH],
+                                   const uint8_t (*signature)[salty_SIGNATURE_SERIALIZED_LENGTH],
+                                   const uint8_t *context_ptr,
+                                   uintptr_t context_len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* salty_h */

fido2/device.h

@@ -7,8 +7,27 @@
 #ifndef _DEVICE_H
 #define _DEVICE_H
 
+#include "stdbool.h"
 #include "storage.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef PUT_TO_SRAM2
+#define PUT_TO_SRAM2 __attribute__((section(".sram2")))
+#endif
+
+#define COLOR_OFF       0x000000
+#define COLOR_WHITE     0xffffff
+#define COLOR_GRAY      0x101010
+#define COLOR_RED       0xff0000
+#define COLOR_GREEN     0x00ff00
+#define COLOR_BLUE      0x0000ff
+#define COLOR_YELLOW    0xffff00
+#define COLOR_CYAN      0x00ffff
+#define COLOR_MAGENTA   0xff00ff
+
 /** Return a millisecond timestamp.  Does not need to be synchronized to anything.
  *  *Optional* to compile, but will not calculate delays correctly without a correct implementation.
 */
@@ -171,6 +190,12 @@ void ctap_overwrite_rk(int index,CTAP_residentKey * rk);
 */
 void device_wink();
 
+/** Show color on the led
+ * 
+ * *Optional*.
+*/
+void device_led(uint32_t color);
+
 typedef enum {
     DEVICE_LOW_POWER_IDLE = 0,
     DEVICE_LOW_POWER_FAST = 1,
@@ -223,4 +248,14 @@ uint16_t device_attestation_cert_der_get_size();
  * */
 void device_read_aaguid(uint8_t * dst);
 
+/** Sleep.
+ * @param ms for sleep.
+ * */
+void delay(uint32_t ms);
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif

fido2/log.c

@@ -52,6 +52,7 @@ struct logtag tagtable[] = {
     {TAG_NFC_APDU, "NAPDU"},
     {TAG_CCID, "CCID"},
     {TAG_CM, "CRED_MGMT"},
+    {TAG_OPENPGP, "OPGP"}
 };
 
 

fido2/log.h

@@ -49,6 +49,7 @@ typedef enum
     TAG_NFC_APDU = (1 << 20),
     TAG_CCID     = (1 << 21),
     TAG_CM       = (1 << 22),
+    TAG_OPENPGP  = (1 << 23),
 
     TAG_NO_TAG   = (1UL << 30),
     TAG_FILENO   = (1UL << 31)

fido2/util.h

@@ -19,4 +19,16 @@ void dump_hex(uint8_t * buf, int size);
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))
 #endif
 
+#ifndef ABS
+#define ABS(a) (((a) > 0) ? (a) : (-a))
+#endif
+
+#ifndef OPTIMIZATION_O2
+#define OPTIMIZATION_O2 __attribute__((optimize("O2")))
+#endif
+
+#ifndef OPTIMIZATION_O0
+#define OPTIMIZATION_O0 __attribute__((optimize("O0")))
+#endif
+
 #endif

solo.cflags

@@ -0,0 +1 @@
+-std=c17

solo.config

@@ -0,0 +1,2 @@
+// Add predefined macros for your project here. For example:
+// #define THE_ANSWER 42

solo.creator

@@ -0,0 +1 @@
+[General]

solo.cxxflags

@@ -0,0 +1 @@
+-std=c++17