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

Recent changes from 0.9.6-stable.

Browse Source
This commit is contained in:
Richard Levitte 2002-06-27 05:38:00 +00:00
parent 49b10f72ec
commit b99e18bbec
2 changed files with 65 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
crypto/asn1/t_pkey.c
View File

@ -96,10 +96,34 @@ int RSA_print(BIO *bp, RSA *x, int off)
char str[128]; char str[128];
const char *s; const char *s;
unsigned char *m=NULL; unsigned char *m=NULL;
int i,ret=0; int ret=0;
size_t buf_len=0, i;
i=RSA_size(x); if (x->n)
m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10); buf_len = (size_t)BN_num_bytes(x->n);
if (x->e)
if (buf_len < (i = (size_t)BN_num_bytes(x->e)))
buf_len = i;
if (x->d)
if (buf_len < (i = (size_t)BN_num_bytes(x->d)))
buf_len = i;
if (x->p)
if (buf_len < (i = (size_t)BN_num_bytes(x->p)))
buf_len = i;
if (x->q)
if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
buf_len = i;
if (x->dmp1)
if (buf_len < (i = (size_t)BN_num_bytes(x->dmp1)))
buf_len = i;
if (x->dmq1)
if (buf_len < (i = (size_t)BN_num_bytes(x->dmq1)))
buf_len = i;
if (x->iqmp)
if (buf_len < (i = (size_t)BN_num_bytes(x->iqmp)))
buf_len = i;
m=(unsigned char *)OPENSSL_malloc(buf_len+10);
if (m == NULL) if (m == NULL)
{ {
RSAerr(RSA_F_RSA_PRINT,ERR_R_MALLOC_FAILURE); RSAerr(RSA_F_RSA_PRINT,ERR_R_MALLOC_FAILURE);
@ -161,22 +185,25 @@ int DSA_print(BIO *bp, DSA *x, int off)
{ {
char str[128]; char str[128];
unsigned char *m=NULL; unsigned char *m=NULL;
int i,ret=0; int ret=0;
BIGNUM *bn=NULL; size_t buf_len=0,i;
if (x->p != NULL) if (x->p)
bn=x->p; buf_len = (size_t)BN_num_bytes(x->p);
else if (x->priv_key != NULL) if (x->q)
bn=x->priv_key; if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
else if (x->pub_key != NULL) buf_len = i;
bn=x->pub_key; if (x->g)
if (buf_len < (i = (size_t)BN_num_bytes(x->g)))
/* larger than needed but what the hell :-) */ buf_len = i;
if (bn != NULL) if (x->priv_key)
i=BN_num_bytes(bn)*2; if (buf_len < (i = (size_t)BN_num_bytes(x->priv_key)))
else buf_len = i;
i=256; if (x->pub_key)
m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10); if (buf_len < (i = (size_t)BN_num_bytes(x->pub_key)))
buf_len = i;
m=(unsigned char *)OPENSSL_malloc(buf_len+10);
if (m == NULL) if (m == NULL)
{ {
DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE); DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE);
@ -281,10 +308,15 @@ int DHparams_print_fp(FILE *fp, DH *x)
int DHparams_print(BIO *bp, DH *x) int DHparams_print(BIO *bp, DH *x)
{ {
unsigned char *m=NULL; unsigned char *m=NULL;
int reason=ERR_R_BUF_LIB,i,ret=0; int reason=ERR_R_BUF_LIB,ret=0;
size_t buf_len=0, i;
i=BN_num_bytes(x->p); if (x->p)
m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10); buf_len = (size_t)BN_num_bytes(x->p);
if (x->g)
if (buf_len < (i = (size_t)BN_num_bytes(x->g)))
buf_len = i;
m=(unsigned char *)OPENSSL_malloc(buf_len+10);
if (m == NULL) if (m == NULL)
{ {
reason=ERR_R_MALLOC_FAILURE; reason=ERR_R_MALLOC_FAILURE;
@ -334,10 +366,18 @@ int DSAparams_print_fp(FILE *fp, DSA *x)
int DSAparams_print(BIO *bp, DSA *x) int DSAparams_print(BIO *bp, DSA *x)
{ {
unsigned char *m=NULL; unsigned char *m=NULL;
int reason=ERR_R_BUF_LIB,i,ret=0; int reason=ERR_R_BUF_LIB,ret=0;
size_t buf_len=0, i;
i=BN_num_bytes(x->p); if (x->p)
m=(unsigned char *)OPENSSL_malloc((unsigned int)i+10); buf_len = (size_t)BN_num_bytes(x->p);
if (x->q)
if (buf_len < (i = (size_t)BN_num_bytes(x->q)))
buf_len = i;
if (x->g)
if (buf_len < (i = (size_t)BN_num_bytes(x->g)))
buf_len = i;
m=(unsigned char *)OPENSSL_malloc(buf_len+10);
if (m == NULL) if (m == NULL)
{ {
reason=ERR_R_MALLOC_FAILURE; reason=ERR_R_MALLOC_FAILURE;

2
util/pod2mantest
View File

@ -11,7 +11,7 @@
IFS=: IFS=:
try_without_dir=true try_without_dir=false
# First we try "pod2man", then "$dir/pod2man" for each item in $PATH. # First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
for dir in dummy:$PATH; do for dir in dummy:$PATH; do
if [ "$try_without_dir" = true ]; then if [ "$try_without_dir" = true ]; then