X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fevp_pkey.c;h=e0c689f1584661d68ae36413e0a1dd4de2143b1e;hb=6f73d28c20459034bfd4090494be9fb1a479c8af;hp=6a456297bc15baa34bfae2411828036b832e22aa;hpb=0f113f3ee4d629ef9a4a30911b22b224772085e5;p=oweals%2Fopenssl.git

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 6a456297bc..e0c689f158 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -59,10 +59,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/rand.h>
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
 
 /* Extract a private key from a PKCS8 structure */
 
@@ -75,7 +75,7 @@ EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8)
     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;
     }
@@ -115,7 +115,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
 {
     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;
     }
@@ -152,13 +152,11 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
     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;
-        break;
 
     default:
         EVPerr(EVP_F_PKCS8_SET_BROKEN, EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);