Latest update.
This commit is contained in:
+7
-5
@@ -13,7 +13,7 @@
|
||||
#include <openssl/asn1.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/x509.h>
|
||||
#include "internal/x509_int.h"
|
||||
#include "crypto/x509.h"
|
||||
#include <openssl/ocsp.h>
|
||||
#include <openssl/rsa.h>
|
||||
#include <openssl/dsa.h>
|
||||
@@ -21,8 +21,8 @@
|
||||
|
||||
#ifndef OPENSSL_NO_SM2
|
||||
|
||||
# include "internal/asn1_int.h"
|
||||
# include "internal/evp_int.h"
|
||||
# include "crypto/asn1.h"
|
||||
# include "crypto/evp.h"
|
||||
|
||||
static int common_verify_sm2(void *data, EVP_PKEY *pkey,
|
||||
int mdnid, int pknid, int req)
|
||||
@@ -607,8 +607,9 @@ int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, const EVP_PKEY *key)
|
||||
{
|
||||
PKCS8_PRIV_KEY_INFO *p8inf;
|
||||
int ret;
|
||||
|
||||
p8inf = EVP_PKEY2PKCS8(key);
|
||||
if (!p8inf)
|
||||
if (p8inf == NULL)
|
||||
return 0;
|
||||
ret = i2d_PKCS8_PRIV_KEY_INFO_fp(fp, p8inf);
|
||||
PKCS8_PRIV_KEY_INFO_free(p8inf);
|
||||
@@ -654,8 +655,9 @@ int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, const EVP_PKEY *key)
|
||||
{
|
||||
PKCS8_PRIV_KEY_INFO *p8inf;
|
||||
int ret;
|
||||
|
||||
p8inf = EVP_PKEY2PKCS8(key);
|
||||
if (!p8inf)
|
||||
if (p8inf == NULL)
|
||||
return 0;
|
||||
ret = i2d_PKCS8_PRIV_KEY_INFO_bio(bp, p8inf);
|
||||
PKCS8_PRIV_KEY_INFO_free(p8inf);
|
||||
|
||||
Reference in New Issue
Block a user