Simplify calculation of encrypted octet length

We were calculating the `enc_octet_len` value by computing an offset
in 4-byte words, then left shifting by 2 so we could subtract from a
length in octets.  This was a bit opaque.  We'll let the compiler do
this work instead by computing the offset in octets.
1 file changed