0c994d54af
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9681)
123 lines
2.6 KiB
C
123 lines
2.6 KiB
C
/*
|
|
* Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/evp.h>
|
|
#include "crypto/asn1.h"
|
|
#include "crypto/siphash.h"
|
|
#include "siphash_local.h"
|
|
#include "crypto/evp.h"
|
|
|
|
/*
|
|
* SIPHASH "ASN1" method. This is just here to indicate the maximum
|
|
* SIPHASH output length and to free up a SIPHASH key.
|
|
*/
|
|
|
|
static int siphash_size(const EVP_PKEY *pkey)
|
|
{
|
|
return SIPHASH_MAX_DIGEST_SIZE;
|
|
}
|
|
|
|
static void siphash_key_free(EVP_PKEY *pkey)
|
|
{
|
|
ASN1_OCTET_STRING *os = EVP_PKEY_get0(pkey);
|
|
|
|
if (os != NULL) {
|
|
if (os->data != NULL)
|
|
OPENSSL_cleanse(os->data, os->length);
|
|
ASN1_OCTET_STRING_free(os);
|
|
}
|
|
}
|
|
|
|
static int siphash_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
|
|
{
|
|
/* nothing (including ASN1_PKEY_CTRL_DEFAULT_MD_NID), is supported */
|
|
return -2;
|
|
}
|
|
|
|
static int siphash_pkey_public_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
|
|
{
|
|
return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b));
|
|
}
|
|
|
|
static int siphash_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
|
|
size_t len)
|
|
{
|
|
ASN1_OCTET_STRING *os;
|
|
|
|
if (pkey->pkey.ptr != NULL || len != SIPHASH_KEY_SIZE)
|
|
return 0;
|
|
|
|
os = ASN1_OCTET_STRING_new();
|
|
if (os == NULL)
|
|
return 0;
|
|
|
|
if (!ASN1_OCTET_STRING_set(os, priv, len)) {
|
|
ASN1_OCTET_STRING_free(os);
|
|
return 0;
|
|
}
|
|
|
|
pkey->pkey.ptr = os;
|
|
return 1;
|
|
}
|
|
|
|
static int siphash_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv,
|
|
size_t *len)
|
|
{
|
|
ASN1_OCTET_STRING *os = (ASN1_OCTET_STRING *)pkey->pkey.ptr;
|
|
|
|
if (priv == NULL) {
|
|
*len = SIPHASH_KEY_SIZE;
|
|
return 1;
|
|
}
|
|
|
|
if (os == NULL || *len < SIPHASH_KEY_SIZE)
|
|
return 0;
|
|
|
|
memcpy(priv, ASN1_STRING_get0_data(os), ASN1_STRING_length(os));
|
|
*len = SIPHASH_KEY_SIZE;
|
|
|
|
return 1;
|
|
}
|
|
|
|
const EVP_PKEY_ASN1_METHOD siphash_asn1_meth = {
|
|
EVP_PKEY_SIPHASH,
|
|
EVP_PKEY_SIPHASH,
|
|
0,
|
|
|
|
"SIPHASH",
|
|
"OpenSSL SIPHASH method",
|
|
|
|
0, 0, siphash_pkey_public_cmp, 0,
|
|
|
|
0, 0, 0,
|
|
|
|
siphash_size,
|
|
0, 0,
|
|
0, 0, 0, 0, 0, 0, 0,
|
|
|
|
siphash_key_free,
|
|
siphash_pkey_ctrl,
|
|
NULL,
|
|
NULL,
|
|
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
|
|
siphash_set_priv_key,
|
|
NULL,
|
|
siphash_get_priv_key,
|
|
NULL,
|
|
};
|