summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7/bio_ber.c
diff options
context:
space:
mode:
authorbeck <>2014-04-26 18:56:38 +0000
committerbeck <>2014-04-26 18:56:38 +0000
commit47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2 (patch)
treedff54039de6c4454b05953e2ce78edfc5693e6b5 /src/lib/libcrypto/pkcs7/bio_ber.c
parent8f710803a9e330d7e3f2e62116ae5b3fc02bd6cf (diff)
downloadopenbsd-47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2.tar.gz
openbsd-47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2.tar.bz2
openbsd-47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2.zip
Replace all use of ERR_add_error_data with ERR_asprintf_error_data.
This avoids a lot of ugly gymnastics to do snprintfs before sending the bag of strings to ERR, and eliminates at least one place in dso_dlfctn.c where it was being called with the incorrect number of arguments and using random things off the stack as addresses of strings. ok krw@, jsing@
Diffstat (limited to 'src/lib/libcrypto/pkcs7/bio_ber.c')
-rw-r--r--src/lib/libcrypto/pkcs7/bio_ber.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs7/bio_ber.c b/src/lib/libcrypto/pkcs7/bio_ber.c
index 04dc5c9b96..d787495a21 100644
--- a/src/lib/libcrypto/pkcs7/bio_ber.c
+++ b/src/lib/libcrypto/pkcs7/bio_ber.c
@@ -155,7 +155,6 @@ static int ber_free(BIO *a)
155 155
156int bio_ber_get_header(BIO *bio, BIO_BER_CTX *ctx) 156int bio_ber_get_header(BIO *bio, BIO_BER_CTX *ctx)
157 { 157 {
158 char buf[64];
159 int i,j,n; 158 int i,j,n;
160 int ret; 159 int ret;
161 unsigned char *p; 160 unsigned char *p;
@@ -215,8 +214,7 @@ int bio_ber_get_header(BIO *bio, BIO_BER_CTX *ctx)
215 if ((ctx->tag >= 0) && (ctx->tag != tag)) 214 if ((ctx->tag >= 0) && (ctx->tag != tag))
216 { 215 {
217 BIOerr(BIO_F_BIO_BER_GET_HEADER,BIO_R_TAG_MISMATCH); 216 BIOerr(BIO_F_BIO_BER_GET_HEADER,BIO_R_TAG_MISMATCH);
218 sprintf(buf,"tag=%d, got %d",ctx->tag,tag); 217 ERR_asprintf_error_data("tag=%d, got %d", ctx->tag, tag);
219 ERR_add_error_data(1,buf);
220 return(-1); 218 return(-1);
221 } 219 }
222 if (ret & 0x01) 220 if (ret & 0x01)