diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-11-13 18:10:30 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-11-13 18:10:30 +0000 |
| commit | 17ed6c06a780487b3a513abb8da20e428d660137 (patch) | |
| tree | 9cb815ecca110574d8c394ac70b7aa354bdafaaf /crypto | |
| parent | c112323dd5d107b199a6d951f8be4c882ff0fba1 (diff) | |
Merge from 0.9.7-stable.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cryptlib.h | 4 | ||||
| -rw-r--r-- | crypto/crypto.h | 4 | ||||
| -rw-r--r-- | crypto/pem/pem_lib.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h index b8727aa6e1..0d6b9d59f0 100644 --- a/crypto/cryptlib.h +++ b/crypto/cryptlib.h @@ -93,10 +93,6 @@ extern "C" { #define DECIMAL_SIZE(type) ((sizeof(type)*8+2)/3+1) #define HEX_SIZE(type) (sizeof(type)*2) -/* die if we have to */ -void OpenSSLDie(const char *file,int line,const char *assertion); -#define OPENSSL_assert(e) ((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e)) - #ifdef __cplusplus } #endif diff --git a/crypto/crypto.h b/crypto/crypto.h index d6cb6f3cd5..2a4dbd5975 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -491,6 +491,10 @@ void CRYPTO_mem_leaks(struct bio_st *bio); typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); +/* die if we have to */ +void OpenSSLDie(const char *file,int line,const char *assertion); +#define OPENSSL_assert(e) ((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e)) + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index fbc94d6a80..8e213c11c4 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -306,7 +306,7 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x, goto err; } /* dzise + 8 bytes are needed */ - // actually it needs the cipher block size extra... + /* actually it needs the cipher block size extra... */ data=(unsigned char *)OPENSSL_malloc((unsigned int)dsize+20); if (data == NULL) { |