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)
39 lines
1.1 KiB
C
39 lines
1.1 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/asn1t.h>
|
|
#include <openssl/x509.h>
|
|
#include "crypto/x509.h"
|
|
|
|
ASN1_SEQUENCE(X509_SIG) = {
|
|
ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),
|
|
ASN1_SIMPLE(X509_SIG, digest, ASN1_OCTET_STRING)
|
|
} ASN1_SEQUENCE_END(X509_SIG)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(X509_SIG)
|
|
|
|
void X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
|
|
const ASN1_OCTET_STRING **pdigest)
|
|
{
|
|
if (palg)
|
|
*palg = sig->algor;
|
|
if (pdigest)
|
|
*pdigest = sig->digest;
|
|
}
|
|
|
|
void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
|
|
ASN1_OCTET_STRING **pdigest)
|
|
{
|
|
if (palg)
|
|
*palg = sig->algor;
|
|
if (pdigest)
|
|
*pdigest = sig->digest;
|
|
}
|