05bb1c5033
The resulting EVP_PKEYs do not do anything useful yet, but we are able to parse them. Teaching them to sign will be done in a follow-up. Creating these from in-memory keys is also slightly different from other types. We don't have or need a public ED25519_KEY struct in curve25519.h, so I've added tighter constructor functions which should hopefully be easier to use anyway. BUG=187 Change-Id: I0bbeea37350d4fdca05b6c6c0f152c15e6ade5bb Reviewed-on: https://boringssl-review.googlesource.com/14446 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
208 lines
6.2 KiB
C
208 lines
6.2 KiB
C
/* Copyright (c) 2017, Google Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/bytestring.h>
|
|
#include <openssl/curve25519.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/mem.h>
|
|
|
|
#include "internal.h"
|
|
#include "../internal.h"
|
|
|
|
|
|
typedef struct {
|
|
union {
|
|
uint8_t priv[64];
|
|
struct {
|
|
/* Shift the location of the public key to align with where it is in the
|
|
* private key representation. */
|
|
uint8_t pad[32];
|
|
uint8_t value[32];
|
|
} pub;
|
|
} key;
|
|
char has_private;
|
|
} ED25519_KEY;
|
|
|
|
static void ed25519_free(EVP_PKEY *pkey) {
|
|
if (pkey->pkey.ptr != NULL) {
|
|
ED25519_KEY *key = pkey->pkey.ptr;
|
|
OPENSSL_cleanse(key, sizeof(ED25519_KEY));
|
|
OPENSSL_free(key);
|
|
pkey->pkey.ptr = NULL;
|
|
}
|
|
}
|
|
|
|
static int set_pubkey(EVP_PKEY *pkey, const uint8_t pubkey[32]) {
|
|
ED25519_KEY *key = OPENSSL_malloc(sizeof(ED25519_KEY));
|
|
if (key == NULL) {
|
|
OPENSSL_PUT_ERROR(EVP, ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
key->has_private = 0;
|
|
OPENSSL_memcpy(key->key.pub.value, pubkey, 32);
|
|
|
|
ed25519_free(pkey);
|
|
pkey->pkey.ptr = key;
|
|
return 1;
|
|
}
|
|
|
|
static int set_privkey(EVP_PKEY *pkey, const uint8_t privkey[64]) {
|
|
ED25519_KEY *key = OPENSSL_malloc(sizeof(ED25519_KEY));
|
|
if (key == NULL) {
|
|
OPENSSL_PUT_ERROR(EVP, ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
key->has_private = 1;
|
|
OPENSSL_memcpy(key->key.priv, privkey, 64);
|
|
|
|
ed25519_free(pkey);
|
|
pkey->pkey.ptr = key;
|
|
return 1;
|
|
}
|
|
|
|
static int ed25519_pub_decode(EVP_PKEY *out, CBS *params, CBS *key) {
|
|
/* See draft-ietf-curdle-pkix-04, section 4. */
|
|
|
|
/* The parameters must be omitted. Public keys have length 32. */
|
|
if (CBS_len(params) != 0 ||
|
|
CBS_len(key) != 32) {
|
|
OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
|
|
return 0;
|
|
}
|
|
|
|
return set_pubkey(out, CBS_data(key));
|
|
}
|
|
|
|
static int ed25519_pub_encode(CBB *out, const EVP_PKEY *pkey) {
|
|
const ED25519_KEY *key = pkey->pkey.ptr;
|
|
|
|
/* See draft-ietf-curdle-pkix-04, section 4. */
|
|
CBB spki, algorithm, oid, key_bitstring;
|
|
if (!CBB_add_asn1(out, &spki, CBS_ASN1_SEQUENCE) ||
|
|
!CBB_add_asn1(&spki, &algorithm, CBS_ASN1_SEQUENCE) ||
|
|
!CBB_add_asn1(&algorithm, &oid, CBS_ASN1_OBJECT) ||
|
|
!CBB_add_bytes(&oid, ed25519_asn1_meth.oid, ed25519_asn1_meth.oid_len) ||
|
|
!CBB_add_asn1(&spki, &key_bitstring, CBS_ASN1_BITSTRING) ||
|
|
!CBB_add_u8(&key_bitstring, 0 /* padding */) ||
|
|
!CBB_add_bytes(&key_bitstring, key->key.pub.value, 32) ||
|
|
!CBB_flush(out)) {
|
|
OPENSSL_PUT_ERROR(EVP, EVP_R_ENCODE_ERROR);
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int ed25519_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) {
|
|
const ED25519_KEY *a_key = a->pkey.ptr;
|
|
const ED25519_KEY *b_key = b->pkey.ptr;
|
|
return OPENSSL_memcmp(a_key->key.pub.value, b_key->key.pub.value, 32) == 0;
|
|
}
|
|
|
|
static int ed25519_priv_decode(EVP_PKEY *out, CBS *params, CBS *key) {
|
|
/* See draft-ietf-curdle-pkix-04, section 7. */
|
|
|
|
/* Parameters must be empty. The key is a 32-byte value wrapped in an extra
|
|
* OCTET STRING layer. */
|
|
CBS inner;
|
|
if (CBS_len(params) != 0 ||
|
|
!CBS_get_asn1(key, &inner, CBS_ASN1_OCTETSTRING) ||
|
|
CBS_len(key) != 0 ||
|
|
CBS_len(&inner) != 32) {
|
|
OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
|
|
return 0;
|
|
}
|
|
|
|
/* The PKCS#8 encoding stores only the 32-byte seed, so we must recover the
|
|
* full representation which we use from it. */
|
|
uint8_t pubkey[32], privkey[64];
|
|
ED25519_keypair_from_seed(pubkey, privkey, CBS_data(&inner));
|
|
return set_privkey(out, privkey);
|
|
}
|
|
|
|
static int ed25519_priv_encode(CBB *out, const EVP_PKEY *pkey) {
|
|
ED25519_KEY *key = pkey->pkey.ptr;
|
|
if (!key->has_private) {
|
|
OPENSSL_PUT_ERROR(EVP, EVP_R_NOT_A_PRIVATE_KEY);
|
|
return 0;
|
|
}
|
|
|
|
/* See draft-ietf-curdle-pkix-04, section 7. */
|
|
CBB pkcs8, algorithm, oid, private_key, inner;
|
|
if (!CBB_add_asn1(out, &pkcs8, CBS_ASN1_SEQUENCE) ||
|
|
!CBB_add_asn1_uint64(&pkcs8, 0 /* version */) ||
|
|
!CBB_add_asn1(&pkcs8, &algorithm, CBS_ASN1_SEQUENCE) ||
|
|
!CBB_add_asn1(&algorithm, &oid, CBS_ASN1_OBJECT) ||
|
|
!CBB_add_bytes(&oid, ed25519_asn1_meth.oid, ed25519_asn1_meth.oid_len) ||
|
|
!CBB_add_asn1(&pkcs8, &private_key, CBS_ASN1_OCTETSTRING) ||
|
|
!CBB_add_asn1(&private_key, &inner, CBS_ASN1_OCTETSTRING) ||
|
|
/* The PKCS#8 encoding stores only the 32-byte seed which is the first 32
|
|
* bytes of the private key. */
|
|
!CBB_add_bytes(&inner, key->key.priv, 32) ||
|
|
!CBB_flush(out)) {
|
|
OPENSSL_PUT_ERROR(EVP, EVP_R_ENCODE_ERROR);
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int ed25519_size(const EVP_PKEY *pkey) { return 64; }
|
|
|
|
static int ed25519_bits(const EVP_PKEY *pkey) { return 256; }
|
|
|
|
const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth = {
|
|
EVP_PKEY_ED25519,
|
|
{0x2b, 0x65, 0x70},
|
|
3,
|
|
ed25519_pub_decode,
|
|
ed25519_pub_encode,
|
|
ed25519_pub_cmp,
|
|
ed25519_priv_decode,
|
|
ed25519_priv_encode,
|
|
NULL /* pkey_opaque */,
|
|
ed25519_size,
|
|
ed25519_bits,
|
|
NULL /* param_missing */,
|
|
NULL /* param_copy */,
|
|
NULL /* param_cmp */,
|
|
ed25519_free,
|
|
};
|
|
|
|
EVP_PKEY *EVP_PKEY_new_ed25519_public(const uint8_t public_key[32]) {
|
|
EVP_PKEY *ret = EVP_PKEY_new();
|
|
if (ret == NULL ||
|
|
!EVP_PKEY_set_type(ret, EVP_PKEY_ED25519) ||
|
|
!set_pubkey(ret, public_key)) {
|
|
EVP_PKEY_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
EVP_PKEY *EVP_PKEY_new_ed25519_private(const uint8_t private_key[64]) {
|
|
EVP_PKEY *ret = EVP_PKEY_new();
|
|
if (ret == NULL ||
|
|
!EVP_PKEY_set_type(ret, EVP_PKEY_ED25519) ||
|
|
!set_privkey(ret, private_key)) {
|
|
EVP_PKEY_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
return ret;
|
|
}
|