diff options
| author |   henning <henning@openbsd.org> | 2003-11-17 18:57:04 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2003-11-17 18:57:04 +0000 |
| commit | 8f5b697b6f0e95e72694eadadd184154dbf3883c (patch) | |
| tree | 38ddecc1dbb5aebfbb6e6e2ff3f28e010b7e8601 /usr.sbin/httpd/src/modules/ssl/ssl_engine_pphrase.c | |
| parent | and make them look all equal.. (diff) | |
| download | wireguard-openbsd-8f5b697b6f0e95e72694eadadd184154dbf3883c.tar.xz wireguard-openbsd-8f5b697b6f0e95e72694eadadd184154dbf3883c.zip | |
merge apache 1.3.29 and mod_ssl 2.8.16
ok brad@
Diffstat (limited to 'usr.sbin/httpd/src/modules/ssl/ssl_engine_pphrase.c')
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_pphrase.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_pphrase.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_pphrase.c index 2821076829b..d887a014b41 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_pphrase.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_pphrase.c @@ -9,7 +9,7 @@ */ /* ==================================================================== - * Copyright (c) 1998-2001 Ralf S. Engelschall. All rights reserved. + * Copyright (c) 1998-2003 Ralf S. Engelschall. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -237,6 +237,9 @@ void ssl_pphrase_Handle(server_rec *s, pool *p) ssl_die(); } cpPassPhraseCur = NULL; + /* Ensure that the error stack is empty; otherwise the + OpenSSL UI code may dump it to stderr. */ + ERR_clear_error(); bReadable = ((pPrivateKey = SSL_read_PrivateKey(fp, NULL, ssl_pphrase_Handle_CB)) != NULL ? TRUE : FALSE); ap_pfclose(p, fp); |