mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
25f2138b0a
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/9333)
107 lines
2.8 KiB
C
107 lines
2.8 KiB
C
/*
|
|
* Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (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/x509v3.h>
|
|
#include "crypto/x509.h"
|
|
#include "ext_dat.h"
|
|
|
|
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx, char *str);
|
|
const X509V3_EXT_METHOD v3_skey_id = {
|
|
NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING),
|
|
0, 0, 0, 0,
|
|
(X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,
|
|
(X509V3_EXT_S2I)s2i_skey_id,
|
|
0, 0, 0, 0,
|
|
NULL
|
|
};
|
|
|
|
char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
|
|
const ASN1_OCTET_STRING *oct)
|
|
{
|
|
return OPENSSL_buf2hexstr(oct->data, oct->length);
|
|
}
|
|
|
|
ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx, const char *str)
|
|
{
|
|
ASN1_OCTET_STRING *oct;
|
|
long length;
|
|
|
|
if ((oct = ASN1_OCTET_STRING_new()) == NULL) {
|
|
X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
|
|
if ((oct->data = OPENSSL_hexstr2buf(str, &length)) == NULL) {
|
|
ASN1_OCTET_STRING_free(oct);
|
|
return NULL;
|
|
}
|
|
|
|
oct->length = length;
|
|
|
|
return oct;
|
|
|
|
}
|
|
|
|
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx, char *str)
|
|
{
|
|
ASN1_OCTET_STRING *oct;
|
|
X509_PUBKEY *pubkey;
|
|
const unsigned char *pk;
|
|
int pklen;
|
|
unsigned char pkey_dig[EVP_MAX_MD_SIZE];
|
|
unsigned int diglen;
|
|
|
|
if (strcmp(str, "hash"))
|
|
return s2i_ASN1_OCTET_STRING(method, ctx, str);
|
|
|
|
if ((oct = ASN1_OCTET_STRING_new()) == NULL) {
|
|
X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
|
|
if (ctx && (ctx->flags == CTX_TEST))
|
|
return oct;
|
|
|
|
if (!ctx || (!ctx->subject_req && !ctx->subject_cert)) {
|
|
X509V3err(X509V3_F_S2I_SKEY_ID, X509V3_R_NO_PUBLIC_KEY);
|
|
goto err;
|
|
}
|
|
|
|
if (ctx->subject_req)
|
|
pubkey = ctx->subject_req->req_info.pubkey;
|
|
else
|
|
pubkey = ctx->subject_cert->cert_info.key;
|
|
|
|
if (pubkey == NULL) {
|
|
X509V3err(X509V3_F_S2I_SKEY_ID, X509V3_R_NO_PUBLIC_KEY);
|
|
goto err;
|
|
}
|
|
|
|
X509_PUBKEY_get0_param(NULL, &pk, &pklen, NULL, pubkey);
|
|
|
|
if (!EVP_Digest(pk, pklen, pkey_dig, &diglen, EVP_sha1(), NULL))
|
|
goto err;
|
|
|
|
if (!ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
|
|
X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
|
|
goto err;
|
|
}
|
|
|
|
return oct;
|
|
|
|
err:
|
|
ASN1_OCTET_STRING_free(oct);
|
|
return NULL;
|
|
}
|