diff options
| author | kris <kris@FreeBSD.org> | 2002-01-27 03:13:07 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-01-27 03:13:07 +0000 |
| commit | 1f8c2aa1763b5d8a328b2fd4053396e94ea48d35 (patch) | |
| tree | 844bea9e360a2132b36667e0042dd30ac9f931ff /crypto/openssl/crypto/evp | |
| parent | 3b19ada1e8e5f87b844d2cc1e72907cfb7774fb6 (diff) | |
| download | FreeBSD-src-1f8c2aa1763b5d8a328b2fd4053396e94ea48d35.zip FreeBSD-src-1f8c2aa1763b5d8a328b2fd4053396e94ea48d35.tar.gz | |
Initial import of OpenSSL 0.9.6c
Diffstat (limited to 'crypto/openssl/crypto/evp')
| -rw-r--r-- | crypto/openssl/crypto/evp/bio_b64.c | 5 | ||||
| -rw-r--r-- | crypto/openssl/crypto/evp/evp.h | 4 | ||||
| -rw-r--r-- | crypto/openssl/crypto/evp/m_md4.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/crypto/openssl/crypto/evp/bio_b64.c b/crypto/openssl/crypto/evp/bio_b64.c index af6fa2a..f12eac1 100644 --- a/crypto/openssl/crypto/evp/bio_b64.c +++ b/crypto/openssl/crypto/evp/bio_b64.c @@ -465,7 +465,8 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr) break; case BIO_CTRL_WPENDING: /* More to write in buffer */ ret=ctx->buf_len-ctx->buf_off; - if ((ret == 0) && (ctx->base64.num != 0)) + if ((ret == 0) && (ctx->encode != B64_NONE) + && (ctx->base64.num != 0)) ret=1; else if (ret <= 0) ret=BIO_ctrl(b->next_bio,cmd,num,ptr); @@ -500,7 +501,7 @@ again: goto again; } } - else if (ctx->base64.num != 0) + else if (ctx->encode != B64_NONE && ctx->base64.num != 0) { ctx->buf_off=0; EVP_EncodeFinal(&(ctx->base64), diff --git a/crypto/openssl/crypto/evp/evp.h b/crypto/openssl/crypto/evp/evp.h index 0f27df4..a61e46b 100644 --- a/crypto/openssl/crypto/evp/evp.h +++ b/crypto/openssl/crypto/evp/evp.h @@ -603,8 +603,6 @@ int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl); int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n); -void ERR_load_EVP_strings(void ); - void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a); int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a); int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen); @@ -777,6 +775,7 @@ void EVP_PBE_cleanup(void); /* 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. */ +void ERR_load_EVP_strings(void); /* Error codes for the EVP functions. */ @@ -849,4 +848,3 @@ void EVP_PBE_cleanup(void); } #endif #endif - diff --git a/crypto/openssl/crypto/evp/m_md4.c b/crypto/openssl/crypto/evp/m_md4.c index 6a24ceb..e5005ab 100644 --- a/crypto/openssl/crypto/evp/m_md4.c +++ b/crypto/openssl/crypto/evp/m_md4.c @@ -66,7 +66,7 @@ static EVP_MD md4_md= { NID_md4, - 0, + NID_md4WithRSAEncryption, MD4_DIGEST_LENGTH, MD4_Init, MD4_Update, |
