diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-01-19 08:53:02 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-01-19 08:53:02 +0000 |
| commit | 8b79f2051d831eb7cb51205b27661d43e3cf3f5e (patch) | |
| tree | fca871353fec9cdc5c0c644580a7007d1f67ca26 /crypto/bn | |
| parent | 799562704032021e111a998c0a2e286e7b405a28 (diff) | |
Recent and not so recent changes from 0.9.7-stable, all conflicts resolved.
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/bn/bn_lib.c | 8 | ||||
| -rw-r--r-- | crypto/bn/bn_print.c | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl index 090fccdf7d..0c6e796d17 100644 --- a/crypto/bn/Makefile.ssl +++ b/crypto/bn/Makefile.ssl @@ -124,7 +124,7 @@ files: $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile + @sh $(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index fa0ff485ad..e1660450bc 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -145,11 +145,11 @@ char *BN_options(void) { init++; #ifdef BN_LLONG - sprintf(data,"bn(%d,%d)",(int)sizeof(BN_ULLONG)*8, - (int)sizeof(BN_ULONG)*8); + BIO_snprintf(data,sizeof data,"bn(%d,%d)", + (int)sizeof(BN_ULLONG)*8,(int)sizeof(BN_ULONG)*8); #else - sprintf(data,"bn(%d,%d)",(int)sizeof(BN_ULONG)*8, - (int)sizeof(BN_ULONG)*8); + BIO_snprintf(data,sizeof data,"bn(%d,%d)", + (int)sizeof(BN_ULONG)*8,(int)sizeof(BN_ULONG)*8); #endif } return(data); diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c index 5f46b1826c..0d942603b1 100644 --- a/crypto/bn/bn_print.c +++ b/crypto/bn/bn_print.c @@ -119,6 +119,7 @@ char *BN_bn2dec(const BIGNUM *a) } if ((t=BN_dup(a)) == NULL) goto err; +#define BUF_REMAIN (num+3 - (size_t)(p - buf)) p=buf; lp=bn_data; if (t->neg) *(p++)='-'; @@ -139,12 +140,12 @@ char *BN_bn2dec(const BIGNUM *a) /* We now have a series of blocks, BN_DEC_NUM chars * in length, where the last one needs truncation. * The blocks need to be reversed in order. */ - sprintf(p,BN_DEC_FMT1,*lp); + BIO_snprintf(p,BUF_REMAIN,BN_DEC_FMT1,*lp); while (*p) p++; while (lp != bn_data) { lp--; - sprintf(p,BN_DEC_FMT2,*lp); + BIO_snprintf(p,BUF_REMAIN,BN_DEC_FMT2,*lp); while (*p) p++; } } |