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)
180 lines
4.7 KiB
C
180 lines
4.7 KiB
C
/*
|
|
* Copyright 1995-2016 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/objects.h"
|
|
#include <openssl/x509.h>
|
|
#include "crypto/evp.h"
|
|
|
|
int EVP_add_cipher(const EVP_CIPHER *c)
|
|
{
|
|
int r;
|
|
|
|
if (c == NULL)
|
|
return 0;
|
|
|
|
r = OBJ_NAME_add(OBJ_nid2sn(c->nid), OBJ_NAME_TYPE_CIPHER_METH,
|
|
(const char *)c);
|
|
if (r == 0)
|
|
return 0;
|
|
r = OBJ_NAME_add(OBJ_nid2ln(c->nid), OBJ_NAME_TYPE_CIPHER_METH,
|
|
(const char *)c);
|
|
return r;
|
|
}
|
|
|
|
int EVP_add_digest(const EVP_MD *md)
|
|
{
|
|
int r;
|
|
const char *name;
|
|
|
|
name = OBJ_nid2sn(md->type);
|
|
r = OBJ_NAME_add(name, OBJ_NAME_TYPE_MD_METH, (const char *)md);
|
|
if (r == 0)
|
|
return 0;
|
|
r = OBJ_NAME_add(OBJ_nid2ln(md->type), OBJ_NAME_TYPE_MD_METH,
|
|
(const char *)md);
|
|
if (r == 0)
|
|
return 0;
|
|
|
|
if (md->pkey_type && md->type != md->pkey_type) {
|
|
r = OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
|
|
OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
|
|
if (r == 0)
|
|
return 0;
|
|
r = OBJ_NAME_add(OBJ_nid2ln(md->pkey_type),
|
|
OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
|
|
}
|
|
return r;
|
|
}
|
|
|
|
const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
|
|
{
|
|
const EVP_CIPHER *cp;
|
|
|
|
if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL))
|
|
return NULL;
|
|
|
|
cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH);
|
|
return cp;
|
|
}
|
|
|
|
const EVP_MD *EVP_get_digestbyname(const char *name)
|
|
{
|
|
const EVP_MD *cp;
|
|
|
|
if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL))
|
|
return NULL;
|
|
|
|
cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH);
|
|
return cp;
|
|
}
|
|
|
|
void evp_cleanup_int(void)
|
|
{
|
|
OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
|
|
OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
|
|
/*
|
|
* The above calls will only clean out the contents of the name hash
|
|
* table, but not the hash table itself. The following line does that
|
|
* part. -- Richard Levitte
|
|
*/
|
|
OBJ_NAME_cleanup(-1);
|
|
|
|
EVP_PBE_cleanup();
|
|
OBJ_sigid_free();
|
|
|
|
evp_app_cleanup_int();
|
|
}
|
|
|
|
struct doall_cipher {
|
|
void *arg;
|
|
void (*fn) (const EVP_CIPHER *ciph,
|
|
const char *from, const char *to, void *arg);
|
|
};
|
|
|
|
static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
|
|
{
|
|
struct doall_cipher *dc = arg;
|
|
if (nm->alias)
|
|
dc->fn(NULL, nm->name, nm->data, dc->arg);
|
|
else
|
|
dc->fn((const EVP_CIPHER *)nm->data, nm->name, NULL, dc->arg);
|
|
}
|
|
|
|
void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
|
|
const char *from, const char *to, void *x),
|
|
void *arg)
|
|
{
|
|
struct doall_cipher dc;
|
|
|
|
/* Ignore errors */
|
|
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL);
|
|
|
|
dc.fn = fn;
|
|
dc.arg = arg;
|
|
OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
|
|
}
|
|
|
|
void EVP_CIPHER_do_all_sorted(void (*fn) (const EVP_CIPHER *ciph,
|
|
const char *from, const char *to,
|
|
void *x), void *arg)
|
|
{
|
|
struct doall_cipher dc;
|
|
|
|
/* Ignore errors */
|
|
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL);
|
|
|
|
dc.fn = fn;
|
|
dc.arg = arg;
|
|
OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
|
|
}
|
|
|
|
struct doall_md {
|
|
void *arg;
|
|
void (*fn) (const EVP_MD *ciph,
|
|
const char *from, const char *to, void *arg);
|
|
};
|
|
|
|
static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
|
|
{
|
|
struct doall_md *dc = arg;
|
|
if (nm->alias)
|
|
dc->fn(NULL, nm->name, nm->data, dc->arg);
|
|
else
|
|
dc->fn((const EVP_MD *)nm->data, nm->name, NULL, dc->arg);
|
|
}
|
|
|
|
void EVP_MD_do_all(void (*fn) (const EVP_MD *md,
|
|
const char *from, const char *to, void *x),
|
|
void *arg)
|
|
{
|
|
struct doall_md dc;
|
|
|
|
/* Ignore errors */
|
|
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
|
|
|
|
dc.fn = fn;
|
|
dc.arg = arg;
|
|
OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
|
|
}
|
|
|
|
void EVP_MD_do_all_sorted(void (*fn) (const EVP_MD *md,
|
|
const char *from, const char *to,
|
|
void *x), void *arg)
|
|
{
|
|
struct doall_md dc;
|
|
|
|
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
|
|
|
|
dc.fn = fn;
|
|
dc.arg = arg;
|
|
OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
|
|
}
|