projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make default_ec_key_meth static
[oweals/openssl.git]
/
crypto
/
ec
/
eck_prn.c
diff --git
a/crypto/ec/eck_prn.c
b/crypto/ec/eck_prn.c
index e39aa711d8339012a55b2c47968a577e3a6628cb..b9653ac9f9c2ed8880cd228f260b770cea1dc498 100644
(file)
--- a/
crypto/ec/eck_prn.c
+++ b/
crypto/ec/eck_prn.c
@@
-62,7
+62,7
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/evp.h>
#include <openssl/ec.h>
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/ec.h>
#include <openssl/bn.h>
@@
-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();
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);
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();
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);
return 0;
ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
EVP_PKEY_free(pk);
@@
-318,22
+318,14
@@
int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
err:
if (!ret)
ECerr(EC_F_ECPKPARAMETERS_PRINT, reason);
err:
if (!ret)
ECerr(EC_F_ECPKPARAMETERS_PRINT, reason);
- if (p)
- BN_free(p);
- if (a)
- BN_free(a);
- if (b)
- BN_free(b);
- if (gen)
- BN_free(gen);
- if (order)
- BN_free(order);
- if (cofactor)
- BN_free(cofactor);
- if (ctx)
- BN_CTX_free(ctx);
- if (buffer != NULL)
- OPENSSL_free(buffer);
+ BN_free(p);
+ BN_free(a);
+ BN_free(b);
+ BN_free(gen);
+ BN_free(order);
+ BN_free(cofactor);
+ BN_CTX_free(ctx);
+ OPENSSL_free(buffer);
return (ret);
}
return (ret);
}
@@
-345,12
+337,14
@@
static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
if (buf == NULL)
return 1;
if (buf == NULL)
return 1;
- if (off) {
+ if (off
> 0
) {
if (off > 128)
off = 128;
memset(str, ' ', off);
if (BIO_write(fp, str, off) <= 0)
return 0;
if (off > 128)
off = 128;
memset(str, ' ', off);
if (BIO_write(fp, str, off) <= 0)
return 0;
+ } else {
+ off = 0;
}
if (BIO_printf(fp, "%s", name) <= 0)
}
if (BIO_printf(fp, "%s", name) <= 0)