diff options
| author | nectar <nectar@FreeBSD.org> | 2003-02-19 23:17:42 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-02-19 23:17:42 +0000 |
| commit | 21bb0e5fa958b55498782bb6040051bad9010e66 (patch) | |
| tree | a69ee61bbf542766bf3da5184b2fbaec03d0c6fe /crypto/openssl/ssl/s3_enc.c | |
| parent | 05d8d6e23fae9150a113e8ab8a8544b981fb7e26 (diff) | |
| parent | 6c9986c446b6cf77f5e83d111dbcca682d6fdd71 (diff) | |
| download | FreeBSD-src-21bb0e5fa958b55498782bb6040051bad9010e66.zip FreeBSD-src-21bb0e5fa958b55498782bb6040051bad9010e66.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r111147,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/openssl/ssl/s3_enc.c')
| -rw-r--r-- | crypto/openssl/ssl/s3_enc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s3_enc.c b/crypto/openssl/ssl/s3_enc.c index 35fde29..559924d 100644 --- a/crypto/openssl/ssl/s3_enc.c +++ b/crypto/openssl/ssl/s3_enc.c @@ -474,6 +474,7 @@ int ssl3_enc(SSL *s, int send) ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED); return 0; } + /* otherwise, rec->length >= bs */ } EVP_Cipher(ds,rec->data,rec->input,l); @@ -482,7 +483,7 @@ int ssl3_enc(SSL *s, int send) { i=rec->data[l-1]+1; /* SSL 3.0 bounds the number of padding bytes by the block size; - * padding bytes (except that last) are arbitrary */ + * padding bytes (except the last one) are arbitrary */ if (i > bs) { /* Incorrect padding. SSLerr() and ssl3_alert are done @@ -491,6 +492,7 @@ int ssl3_enc(SSL *s, int send) * (see http://www.openssl.org/~bodo/tls-cbc.txt) */ return -1; } + /* now i <= bs <= rec->length */ rec->length-=i; } } |
