diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
| commit | 0fa0c9fb7d6f4ad7a423044f28b55eaaedc63f28 (patch) | |
| tree | 98d6947cd8474ab98b57494ebef50e97659be043 /lib/libcrypto/rsa/rsa_gen.c | |
| parent | ecc645c71513728e7357c84aa8997b4dc2301936 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/rsa/rsa_gen.c')
| -rw-r--r-- | lib/libcrypto/rsa/rsa_gen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/rsa/rsa_gen.c b/lib/libcrypto/rsa/rsa_gen.c index adb5e34da56..dd1422cc98b 100644 --- a/lib/libcrypto/rsa/rsa_gen.c +++ b/lib/libcrypto/rsa/rsa_gen.c @@ -184,7 +184,8 @@ err: RSAerr(RSA_F_RSA_GENERATE_KEY,ERR_LIB_BN); ok=0; } - BN_CTX_end(ctx); + if (ctx != NULL) + BN_CTX_end(ctx); BN_CTX_free(ctx); BN_CTX_free(ctx2); |