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

2 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c
index 314bdfb1c7..89ae73a6de 100644
--- a/src/lib/libcrypto/asn1/t_x509.c
+++ b/src/lib/libcrypto/asn1/t_x509.c
@@ -349,6 +349,8 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
         ll=80-2-obase;
 
         s=X509_NAME_oneline(name,buf,256);
+        if (!*s)
+                return 1;
         s++; /* skip the first slash */
 
         l=ll;
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c
index b2e2a51477..4397a404b5 100644
--- a/src/lib/libcrypto/asn1/x_pubkey.c
+++ b/src/lib/libcrypto/asn1/x_pubkey.c
@@ -234,7 +234,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
         a=key->algor;
         if (ret->type == EVP_PKEY_DSA)
                 {
-                if (a->parameter->type == V_ASN1_SEQUENCE)
+                if (a->parameter && (a->parameter->type == V_ASN1_SEQUENCE))
                         {
                         ret->pkey.dsa->write_params=0;
                         p=a->parameter->value.sequence->data;