merge openssl 0.9.6b-engine

Note that this is a maintenence release, API's appear *not* to have changed.
As such, I have only increased the minor number on these libraries

1 files changed, 2 insertions, 0 deletions

diff --git a/src/lib/libcrypto/x509/x509_obj.c b/src/lib/libcrypto/x509/x509_obj.c
index 6a3ba8eb15..f0271fdfa1 100644
--- a/src/lib/libcrypto/x509/x509_obj.c
+++ b/src/lib/libcrypto/x509/x509_obj.c
@@ -214,6 +214,8 @@ int i;
                 }
         else
                 p=buf;
+        if (i == 0)
+                *p = '\0';
         return(p);
 err:
         X509err(X509_F_X509_NAME_ONELINE,ERR_R_MALLOC_FAILURE);