Minor changes made by Matt Caswell Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit 648495864513da788246f9b75dbbbce0614ed5e8)
Submitted by: Mike Frysinger <vapier@gentoo.org>