Commit 71a5516d authored by Richard Levitte's avatar Richard Levitte
Browse files

Add the STORE module 



This STORE module adds the following functionality:

- A function OSSL_STORE_open(), OSSL_STORE_load() and OSSL_STORE_close()
  that accesses a URI and helps loading the supported objects (PKEYs,
  CERTs and CRLs for the moment) from it.
- An opaque type OSSL_STORE_INFO that holds information on each loaded
  object.
- A few functions to retrieve desired data from a OSSL_STORE_INFO
  reference.
- Functions to register and unregister loaders for different URI
  schemes.  This enables dynamic addition of loaders from applications
  or from engines.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3542)
parent c785fd48

Configure

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ $config{sdirs} = [ 
    "bn", "ec", "rsa", "dsa", "dh", "dso", "engine",

    "buffer", "bio", "stack", "lhash", "rand", "err",

    "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",

    "cms", "ts", "srp", "cmac", "ct", "async", "kdf"

    "cms", "ts", "srp", "cmac", "ct", "async", "kdf", "store"

    ];

# test/ subdirectories to build

$config{tdirs} = [ "ossl_shim" ];

crypto/err/err.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static ERR_STRING_DATA ERR_str_libraries[] = { 
    {ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines"},

    {ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines"},

    {ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines"},

    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, 0), "STORE routines"},

    {0, NULL},

};
@@ -108,6 +109,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = { 
    {ERR_R_X509V3_LIB, "X509V3 lib"},

    {ERR_R_ENGINE_LIB, "ENGINE lib"},

    {ERR_R_UI_LIB, "UI lib"},

    {ERR_R_OSSL_STORE_LIB, "STORE lib"},

    {ERR_R_ECDSA_LIB, "ECDSA lib"},



    {ERR_R_NESTED_ASN1_ERROR, "nested asn1 error"},

crypto/err/err_all.c

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <openssl/ct.h>

#include <openssl/async.h>

#include <openssl/kdf.h>

#include <openssl/store.h>



int err_load_crypto_strings_int(void)

{
@@ -93,7 +94,8 @@ int err_load_crypto_strings_int(void) 
# endif

        ERR_load_ASYNC_strings() == 0 ||

#endif

        ERR_load_KDF_strings() == 0)

        ERR_load_KDF_strings() == 0 ||

        ERR_load_OSSL_STORE_strings() == 0)

        return 0;



    return 1;

crypto/err/openssl.ec

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ L CMS include/openssl/cms.h crypto/cms/cms_err.c 
L CT            include/openssl/ct.h            crypto/ct/ct_err.c

L ASYNC         include/openssl/async.h         crypto/async/async_err.c

L KDF           include/openssl/kdf.h           crypto/kdf/kdf_err.c

L OSSL_STORE    include/openssl/store.h         crypto/store/store_err.c



# additional header files to be scanned for function names

L NONE          include/openssl/x509_vfy.h      NONE

crypto/err/openssl.txt

+29 −0
Original line number Diff line number Diff line
@@ -724,6 +724,28 @@ OCSP_F_OCSP_REQUEST_SIGN:110:OCSP_request_sign 
OCSP_F_OCSP_REQUEST_VERIFY:116:OCSP_request_verify

OCSP_F_OCSP_RESPONSE_GET1_BASIC:111:OCSP_response_get1_basic

OCSP_F_PARSE_HTTP_LINE1:118:parse_http_line1

OSSL_STORE_F_OSSL_STORE_GET0_LOADER_INT:100:ossl_store_get0_loader_int

OSSL_STORE_F_OSSL_STORE_INFO_GET1_CERT:101:OSSL_STORE_INFO_get1_CERT

OSSL_STORE_F_OSSL_STORE_INFO_GET1_CRL:102:OSSL_STORE_INFO_get1_CRL

OSSL_STORE_F_OSSL_STORE_INFO_GET1_NAME:103:OSSL_STORE_INFO_get1_NAME

OSSL_STORE_F_OSSL_STORE_INFO_GET1_NAME_DESCRIPTION:135:\

	OSSL_STORE_INFO_get1_NAME_description

OSSL_STORE_F_OSSL_STORE_INFO_GET1_PARAMS:104:OSSL_STORE_INFO_get1_PARAMS

OSSL_STORE_F_OSSL_STORE_INFO_GET1_PKEY:105:OSSL_STORE_INFO_get1_PKEY

OSSL_STORE_F_OSSL_STORE_INFO_NEW_CERT:106:OSSL_STORE_INFO_new_CERT

OSSL_STORE_F_OSSL_STORE_INFO_NEW_CRL:107:OSSL_STORE_INFO_new_CRL

OSSL_STORE_F_OSSL_STORE_INFO_NEW_NAME:109:OSSL_STORE_INFO_new_NAME

OSSL_STORE_F_OSSL_STORE_INFO_NEW_PARAMS:110:OSSL_STORE_INFO_new_PARAMS

OSSL_STORE_F_OSSL_STORE_INFO_NEW_PKEY:111:OSSL_STORE_INFO_new_PKEY

OSSL_STORE_F_OSSL_STORE_INFO_SET0_NAME_DESCRIPTION:134:\

	OSSL_STORE_INFO_set0_NAME_description

OSSL_STORE_F_OSSL_STORE_INIT_ONCE:112:ossl_store_init_once

OSSL_STORE_F_OSSL_STORE_LOADER_NEW:113:OSSL_STORE_LOADER_new

OSSL_STORE_F_OSSL_STORE_OPEN:114:OSSL_STORE_open

OSSL_STORE_F_OSSL_STORE_OPEN_INT:115:*

OSSL_STORE_F_OSSL_STORE_REGISTER_LOADER_INT:117:ossl_store_register_loader_int

OSSL_STORE_F_OSSL_STORE_UNREGISTER_LOADER_INT:116:\

	ossl_store_unregister_loader_int

PEM_F_B2I_DSS:127:b2i_dss

PEM_F_B2I_PVK_BIO:128:b2i_PVK_bio

PEM_F_B2I_RSA:129:b2i_rsa
@@ -1950,6 +1972,13 @@ OCSP_R_STATUS_TOO_OLD:127:status too old 
OCSP_R_UNKNOWN_MESSAGE_DIGEST:119:unknown message digest

OCSP_R_UNKNOWN_NID:120:unknown nid

OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE:129:unsupported requestorname type

OSSL_STORE_R_INVALID_SCHEME:106:invalid scheme

OSSL_STORE_R_NOT_A_CERTIFICATE:100:not a certificate

OSSL_STORE_R_NOT_A_CRL:101:not a crl

OSSL_STORE_R_NOT_A_KEY:102:not a key

OSSL_STORE_R_NOT_A_NAME:103:not a name

OSSL_STORE_R_NOT_PARAMETERS:104:not parameters

OSSL_STORE_R_UNREGISTERED_SCHEME:105:unregistered scheme

PEM_R_BAD_BASE64_DECODE:100:bad base64 decode

PEM_R_BAD_DECRYPT:101:bad decrypt

PEM_R_BAD_END_LINE:102:bad end line