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)
62 lines
1.7 KiB
C
62 lines
1.7 KiB
C
/*
|
|
* Copyright 1995-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/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/x509.h>
|
|
#include "crypto/evp.h"
|
|
|
|
int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
|
|
unsigned int *siglen, EVP_PKEY *pkey)
|
|
{
|
|
unsigned char m[EVP_MAX_MD_SIZE];
|
|
unsigned int m_len = 0;
|
|
int i = 0;
|
|
size_t sltmp;
|
|
EVP_PKEY_CTX *pkctx = NULL;
|
|
|
|
*siglen = 0;
|
|
if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_FINALISE)) {
|
|
if (!EVP_DigestFinal_ex(ctx, m, &m_len))
|
|
goto err;
|
|
} else {
|
|
int rv = 0;
|
|
EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_new();
|
|
if (tmp_ctx == NULL) {
|
|
EVPerr(EVP_F_EVP_SIGNFINAL, ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
|
|
if (rv)
|
|
rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);
|
|
EVP_MD_CTX_free(tmp_ctx);
|
|
if (!rv)
|
|
return 0;
|
|
}
|
|
|
|
sltmp = (size_t)EVP_PKEY_size(pkey);
|
|
i = 0;
|
|
pkctx = EVP_PKEY_CTX_new(pkey, NULL);
|
|
if (pkctx == NULL)
|
|
goto err;
|
|
if (EVP_PKEY_sign_init(pkctx) <= 0)
|
|
goto err;
|
|
if (EVP_PKEY_CTX_set_signature_md(pkctx, EVP_MD_CTX_md(ctx)) <= 0)
|
|
goto err;
|
|
if (EVP_PKEY_sign(pkctx, sigret, &sltmp, m, m_len) <= 0)
|
|
goto err;
|
|
*siglen = sltmp;
|
|
i = 1;
|
|
err:
|
|
EVP_PKEY_CTX_free(pkctx);
|
|
return i;
|
|
}
|