diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/bio/bio_lib.c | |
| parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
| download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/bio/bio_lib.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bio_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c index 3f52ae953c..77f4de9c32 100644 --- a/src/lib/libcrypto/bio/bio_lib.c +++ b/src/lib/libcrypto/bio/bio_lib.c | |||
| @@ -429,7 +429,7 @@ BIO *BIO_push(BIO *b, BIO *bio) | |||
| 429 | if (bio != NULL) | 429 | if (bio != NULL) |
| 430 | bio->prev_bio=lb; | 430 | bio->prev_bio=lb; |
| 431 | /* called to do internal processing */ | 431 | /* called to do internal processing */ |
| 432 | BIO_ctrl(b,BIO_CTRL_PUSH,0,NULL); | 432 | BIO_ctrl(b,BIO_CTRL_PUSH,0,lb); |
| 433 | return(b); | 433 | return(b); |
| 434 | } | 434 | } |
| 435 | 435 | ||
| @@ -441,7 +441,7 @@ BIO *BIO_pop(BIO *b) | |||
| 441 | if (b == NULL) return(NULL); | 441 | if (b == NULL) return(NULL); |
| 442 | ret=b->next_bio; | 442 | ret=b->next_bio; |
| 443 | 443 | ||
| 444 | BIO_ctrl(b,BIO_CTRL_POP,0,NULL); | 444 | BIO_ctrl(b,BIO_CTRL_POP,0,b); |
| 445 | 445 | ||
| 446 | if (b->prev_bio != NULL) | 446 | if (b->prev_bio != NULL) |
| 447 | b->prev_bio->next_bio=b->next_bio; | 447 | b->prev_bio->next_bio=b->next_bio; |