X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fec%2Feck_prn.c;h=b9653ac9f9c2ed8880cd228f260b770cea1dc498;hb=a0ffedaf7bb7b457b42108b8819d00e64003b3a9;hp=6eb529138a24c7e6c66096b3cf9207c7dc72746d;hpb=23a1d5e97cd543d2b8e1b01dbf0f619b2e5ce540;p=oweals%2Fopenssl.git diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c index 6eb529138a..b9653ac9f9 100644 --- a/crypto/ec/eck_prn.c +++ b/crypto/ec/eck_prn.c @@ -62,7 +62,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include @@ -119,7 +119,7 @@ int EC_KEY_print(BIO *bp, const EC_KEY *x, int off) EVP_PKEY *pk; int ret; pk = EVP_PKEY_new(); - if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x)) + if (pk == NULL || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x)) return 0; ret = EVP_PKEY_print_private(bp, pk, off, NULL); EVP_PKEY_free(pk); @@ -131,7 +131,7 @@ int ECParameters_print(BIO *bp, const EC_KEY *x) EVP_PKEY *pk; int ret; pk = EVP_PKEY_new(); - if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x)) + if (pk == NULL || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x)) return 0; ret = EVP_PKEY_print_params(bp, pk, 4, NULL); EVP_PKEY_free(pk); @@ -325,8 +325,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off) BN_free(order); BN_free(cofactor); BN_CTX_free(ctx); - if (buffer != NULL) - OPENSSL_free(buffer); + OPENSSL_free(buffer); return (ret); }