diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libcrypto/bio/bio.h | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/bio/bio.h')
| -rw-r--r-- | src/lib/libcrypto/bio/bio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h index fbbc16d00c..2eb703830f 100644 --- a/src/lib/libcrypto/bio/bio.h +++ b/src/lib/libcrypto/bio/bio.h | |||
| @@ -347,6 +347,7 @@ typedef struct bio_f_buffer_ctx_struct | |||
| 347 | #define BIO_C_NWRITE0 145 | 347 | #define BIO_C_NWRITE0 145 |
| 348 | #define BIO_C_NWRITE 146 | 348 | #define BIO_C_NWRITE 146 |
| 349 | #define BIO_C_RESET_READ_REQUEST 147 | 349 | #define BIO_C_RESET_READ_REQUEST 147 |
| 350 | #define BIO_C_SET_MD_CTX 148 | ||
| 350 | 351 | ||
| 351 | 352 | ||
| 352 | #define BIO_set_app_data(s,arg) BIO_set_ex_data(s,0,arg) | 353 | #define BIO_set_app_data(s,arg) BIO_set_ex_data(s,0,arg) |