generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use new BIO_indent() function here as well

Browse Source 
Submitted by: Nils Larsch
This commit is contained in:
Bodo Möller 2002-11-14 10:56:59 +00:00
parent eaad02a747
commit 555d75252a
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
crypto/asn1/t_pkey.c
View File

@ -275,7 +275,6 @@ int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off)
int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off) int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
{ {
char str[128];
unsigned char *buffer=NULL; unsigned char *buffer=NULL;
size_t buf_len=0, i; size_t buf_len=0, i;
int ret=0, reason=ERR_R_BIO_LIB; int ret=0, reason=ERR_R_BIO_LIB;
@ -301,14 +300,8 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
/* the curve parameter are given by an asn1 OID */ /* the curve parameter are given by an asn1 OID */
int nid; int nid;
if (off) if (!BIO_indent(bp, off, 128))
{ goto err;
if (off > 128)
off=128;
memset(str, ' ', off);
if (BIO_write(bp, str, off) <= 0)
goto err;
}
nid = EC_GROUP_get_nid(x); nid = EC_GROUP_get_nid(x);
if (nid == 0) if (nid == 0)
@ -396,13 +389,10 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
reason = ERR_R_MALLOC_FAILURE; reason = ERR_R_MALLOC_FAILURE;
goto err; goto err;
} }
if (off)
{ if (!BIO_indent(bp, off, 128))
if (off > 128) off=128; goto err;
memset(str,' ',off);
if (BIO_write(bp, str, off) <= 0)
goto err;
}
/* print the 'short name' of the field type */ /* print the 'short name' of the field type */
if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid)) if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid))
<= 0) <= 0)
@ -415,13 +405,8 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
if (basis_type == 0) if (basis_type == 0)
goto err; goto err;
if (off) if (!BIO_indent(bp, off, 128))
{ goto err;
if (off > 128) off=128;
memset(str,' ',off);
if (BIO_write(bp, str, off) <= 0)
goto err;
}
if (BIO_printf(bp, "Basis Type: %s\n", if (BIO_printf(bp, "Basis Type: %s\n",
OBJ_nid2sn(basis_type)) <= 0) OBJ_nid2sn(basis_type)) <= 0)
@ -491,7 +476,6 @@ err:
int EC_KEY_print(BIO *bp, const EC_KEY *x, int off) int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
{ {
char str[128];
unsigned char *buffer=NULL; unsigned char *buffer=NULL;
size_t buf_len=0, i; size_t buf_len=0, i;
int ret=0, reason=ERR_R_BIO_LIB; int ret=0, reason=ERR_R_BIO_LIB;
@ -524,14 +508,11 @@ int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
reason = ERR_R_MALLOC_FAILURE; reason = ERR_R_MALLOC_FAILURE;
goto err; goto err;
} }
if (off)
{
if (off > 128) off=128;
memset(str,' ',off);
}
if (x->priv_key != NULL) if (x->priv_key != NULL)
{ {
if (off && (BIO_write(bp, str, off) <= 0)) goto err; if (!BIO_indent(bp, off, 128))
goto err;
if (BIO_printf(bp, "Private-Key: (%d bit)\n", if (BIO_printf(bp, "Private-Key: (%d bit)\n",
BN_num_bits(x->priv_key)) <= 0) goto err; BN_num_bits(x->priv_key)) <= 0) goto err;
} }