projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove update tags
[oweals/openssl.git]
/
crypto
/
evp
/
evp_pkey.c
diff --git
a/crypto/evp/evp_pkey.c
b/crypto/evp/evp_pkey.c
index 6a456297bc15baa34bfae2411828036b832e22aa..65ccd5bac4fd2cac3ab8223179e6e53b14033358 100644
(file)
--- a/
crypto/evp/evp_pkey.c
+++ b/
crypto/evp/evp_pkey.c
@@
-59,10
+59,11
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/x509.h>
#include <openssl/rand.h>
#include <openssl/x509.h>
#include <openssl/rand.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
+#include "internal/evp_int.h"
/* Extract a private key from a PKCS8 structure */
/* Extract a private key from a PKCS8 structure */
@@
-75,7
+76,7
@@
EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8)
if (!PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8))
return NULL;
if (!PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8))
return NULL;
- if (
!(pkey = EVP_PKEY_new())
) {
+ if (
(pkey = EVP_PKEY_new()) == NULL
) {
EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_MALLOC_FAILURE);
return NULL;
}
EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_MALLOC_FAILURE);
return NULL;
}
@@
-115,7
+116,7
@@
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
{
PKCS8_PRIV_KEY_INFO *p8;
{
PKCS8_PRIV_KEY_INFO *p8;
- if (
!(p8 = PKCS8_PRIV_KEY_INFO_new())
) {
+ if (
(p8 = PKCS8_PRIV_KEY_INFO_new()) == NULL
) {
EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, ERR_R_MALLOC_FAILURE);
return NULL;
}
EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, ERR_R_MALLOC_FAILURE);
return NULL;
}
@@
-152,13
+153,11
@@
PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
case PKCS8_OK:
p8->broken = PKCS8_OK;
return p8;
case PKCS8_OK:
p8->broken = PKCS8_OK;
return p8;
- break;
case PKCS8_NO_OCTET:
p8->broken = PKCS8_NO_OCTET;
p8->pkey->type = V_ASN1_SEQUENCE;
return p8;
case PKCS8_NO_OCTET:
p8->broken = PKCS8_NO_OCTET;
p8->pkey->type = V_ASN1_SEQUENCE;
return p8;
- break;
default:
EVPerr(EVP_F_PKCS8_SET_BROKEN, EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);
default:
EVPerr(EVP_F_PKCS8_SET_BROKEN, EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);