wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If present print j, seed and counter values for DH

Browse source 
(cherry picked from commit c9577ab5ea)

Conflicts:

	crypto/dh/dh_ameth.c
This commit is contained in:
Dr. Stephen Henson 2013-08-02 14:40:00 +01:00
parent c6f3386577
commit 52d0e1ca4e
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
crypto/dh/dh_ameth.c
View file

@ -363,6 +363,9 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
}
update_buflen(x->g, &buf_len);
update_buflen(x->q, &buf_len);
update_buflen(x->j, &buf_len);
update_buflen(x->counter, &buf_len);
update_buflen(pub_key, &buf_len);
update_buflen(priv_key, &buf_len);
@ -390,6 +393,30 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
if (!ASN1_bn_print(bp,"prime:",x->p,m,indent)) goto err;
if (!ASN1_bn_print(bp,"generator:",x->g,m,indent)) goto err;
if (x->q && !ASN1_bn_print(bp,"subgroup order:",x->q,m,indent)) goto err;
if (x->j && !ASN1_bn_print(bp,"subgroup factor:",x->j,m,indent))
goto err;
if (x->seed)
{
int i;
BIO_indent(bp, indent, 128);
BIO_puts(bp, "seed:");
for (i=0; i < x->seedlen; i++)
{
if ((i%15) == 0)
{
if(BIO_puts(bp,"\n") <= 0
|| !BIO_indent(bp,indent+4,128))
goto err;
}
if (BIO_printf(bp,"%02x%s", x->seed[i],
((i+1) == x->seedlen)?"":":") <= 0)
goto err;
}
if (BIO_write(bp,"\n",1) <= 0) return(0);
}
if (x->counter && !ASN1_bn_print(bp,"counter:",x->counter,m,indent))
goto err;
if (x->length != 0)
{
BIO_indent(bp, indent, 128);