diff options
| author | Ralf S. Engelschall <rse@openssl.org> | 1998-12-21 10:56:39 +0000 |
|---|---|---|
| committer | Ralf S. Engelschall <rse@openssl.org> | 1998-12-21 10:56:39 +0000 |
| commit | 58964a492275ca9a59a0cd9c8155cb2491b4b909 (patch) | |
| tree | c7b16876a5789463bbbb468ef4829c8129b3d718 /crypto/buffer | |
| parent | d02b48c63a58ea4367a0e905979f140b7d090f86 (diff) | |
Import of old SSLeay release: SSLeay 0.9.0b
Diffstat (limited to 'crypto/buffer')
| -rw-r--r-- | crypto/buffer/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/buffer/buf_err.c | 10 | ||||
| -rw-r--r-- | crypto/buffer/buffer.c | 10 | ||||
| -rw-r--r-- | crypto/buffer/buffer.h | 6 |
4 files changed, 20 insertions, 8 deletions
diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl index 35367933b3..a5f150e523 100644 --- a/crypto/buffer/Makefile.ssl +++ b/crypto/buffer/Makefile.ssl @@ -79,6 +79,6 @@ clean: errors: perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl $(ERR).h $(ERRC).c + perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c index 8cb9f33056..ff988852cc 100644 --- a/crypto/buffer/buf_err.c +++ b/crypto/buffer/buf_err.c @@ -60,6 +60,7 @@ #include "buffer.h" /* BEGIN ERROR CODES */ +#ifndef NO_ERR static ERR_STRING_DATA BUF_str_functs[]= { {ERR_PACK(0,BUF_F_BUF_MEM_GROW,0), "BUF_MEM_grow"}, @@ -69,13 +70,18 @@ static ERR_STRING_DATA BUF_str_functs[]= {0,NULL}, }; +#endif + void ERR_load_BUF_strings() { static int init=1; - if (init) - { + if (init); + {; init=0; +#ifndef NO_ERR ERR_load_strings(ERR_LIB_BUF,BUF_str_functs); +#endif + } } diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c index df7e2fad2b..7e8af9e2fa 100644 --- a/crypto/buffer/buffer.c +++ b/crypto/buffer/buffer.c @@ -1,5 +1,5 @@ /* crypto/buffer/buffer.c */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written @@ -94,7 +94,11 @@ int len; char *ret; unsigned int n; - if (str->length >= len) return(len); + if (str->length >= len) + { + str->length=len; + return(len); + } if (str->max >= len) { memset(&(str->data[str->length]),0,len-str->length); @@ -126,6 +130,8 @@ char *str; char *ret; int n; + if (str == NULL) return(NULL); + n=strlen(str); ret=Malloc(n+1); if (ret == NULL) diff --git a/crypto/buffer/buffer.h b/crypto/buffer/buffer.h index 87c9071e49..417548c04a 100644 --- a/crypto/buffer/buffer.h +++ b/crypto/buffer/buffer.h @@ -1,5 +1,5 @@ /* crypto/buffer/buffer.h */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written @@ -65,9 +65,9 @@ extern "C" { typedef struct buf_mem_st { - int length; + int length; /* current number of bytes */ char *data; - int max; + int max; /* size of buffer */ } BUF_MEM; #ifndef NOPROTO |