diff options
| author |   djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
| commit | 40d8aef356a70d0b13395f0805e3044b85d91347 (patch) | |
| tree | 22edbfd34c49ce1b7988794a7a74d65829c13819 /lib/libssl/ssl_rsa.c | |
| parent | import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@ (diff) | |
| download | wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.tar.xz wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/ssl_rsa.c')
| -rw-r--r-- | lib/libssl/ssl_rsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c index 330390519bb..fb0bd4d0452 100644 --- a/lib/libssl/ssl_rsa.c +++ b/lib/libssl/ssl_rsa.c @@ -804,7 +804,7 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file) /* When the while loop ends, it's usually just EOF. */ err = ERR_peek_last_error(); if (ERR_GET_LIB(err) == ERR_LIB_PEM && ERR_GET_REASON(err) == PEM_R_NO_START_LINE) - (void)ERR_get_error(); + ERR_clear_error(); else ret = 0; /* some real error */ } |