198a199
> #ifndef OPENSSL_NO_ENGINE
199a201
> #endif
335a338
> #ifndef OPENSSL_NO_ENGINE
336a340
> #endif
539a544
> #ifndef OPENSSL_NO_ENGINE
544a550
> #endif
564a571
> #ifndef OPENSSL_NO_ENGINE
565a573
> #endif
599a608
> {
600a610,611
> tofree = NULL;
> }
1636c1647,1648
< sk_X509_pop_free(cert_sk,X509_free);
---
> if (cert_sk)
> sk_X509_pop_free(cert_sk,X509_free);
1640c1652
< if (free_key)
---
> if (free_key && key)