diff options
| author | kris <kris@FreeBSD.org> | 2002-01-27 03:17:13 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-01-27 03:17:13 +0000 |
| commit | 7b695f1ddd82d490cdda720d8f2582d974e68402 (patch) | |
| tree | 8b8666bb4e0a4b9c1b9cb968fd73db474c9521a6 /crypto/openssl/ssl/s2_enc.c | |
| parent | 0b3d98771f14f56f6b501527f0c5de53c5fe7483 (diff) | |
| download | FreeBSD-src-7b695f1ddd82d490cdda720d8f2582d974e68402.zip FreeBSD-src-7b695f1ddd82d490cdda720d8f2582d974e68402.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssl/ssl/s2_enc.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/s2_enc.c b/crypto/openssl/ssl/s2_enc.c index 7643f96..69e5997 100644 --- a/crypto/openssl/ssl/s2_enc.c +++ b/crypto/openssl/ssl/s2_enc.c @@ -113,8 +113,8 @@ err: } /* read/writes from s->s2->mac_data using length for encrypt and - * decrypt. It sets the s->s2->padding, s->[rw]length and - * s->s2->pad_data ptr if we are encrypting */ + * decrypt. It sets s->s2->padding and s->[rw]length + * if we are encrypting */ void ssl2_enc(SSL *s, int send) { EVP_CIPHER_CTX *ds; |
