diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-02-20 23:43:02 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-02-20 23:43:02 +0000 |
| commit | d3442bc780473f0cd4f378bc31130d4579da640b (patch) | |
| tree | a9e0e2f1ba5080829e22783c739a9cacaa95ebd5 /crypto/evp/bio_b64.c | |
| parent | dab6f09573742df94c4767663565aca3863f8173 (diff) | |
| download | openssl-new-d3442bc780473f0cd4f378bc31130d4579da640b.tar.gz | |
Move the registration of callback functions to special functions
designed for that. This removes the potential error to mix data and
function pointers.
Please note that I'm a little unsure how incorrect calls to the old
ctrl functions should be handled, in som cases. I currently return 0
and that's it, but it may be more correct to generate a genuine error
in those cases.
Diffstat (limited to 'crypto/evp/bio_b64.c')
| -rw-r--r-- | crypto/evp/bio_b64.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c index 913bafa5f7..bd5e24f993 100644 --- a/crypto/evp/bio_b64.c +++ b/crypto/evp/bio_b64.c @@ -69,6 +69,7 @@ static int b64_read(BIO *h,char *buf,int size); static long b64_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int b64_new(BIO *h); static int b64_free(BIO *data); +static long b64_callback_ctrl(BIO *h,int cmd,void (*fp)()); #define B64_BLOCK_SIZE 1024 #define B64_BLOCK_SIZE2 768 #define B64_NONE 0 @@ -100,6 +101,7 @@ static BIO_METHOD methods_b64= b64_ctrl, b64_new, b64_free, + b64_callback_ctrl, }; BIO_METHOD *BIO_f_base64(void) @@ -522,3 +524,17 @@ again: return(ret); } +static long b64_callback_ctrl(BIO *b, int cmd, void (*fp)()) + { + long ret=1; + + if (b->next_bio == NULL) return(0); + switch (cmd) + { + default: + ret=BIO_callback_ctrl(b->next_bio,cmd,fp); + break; + } + return(ret); + } + |