Browse code
Solved hidden merge conflict between feat_misc and bugfix2.1
The OCSP patch (commit a3982181e284f8c5c8f, feat_misc) introduced
a new function which was calling create_temp_filename(). When merging
in bugfix2.1 into allmerged, create_temp_filename() got renamed to
create_temp_file() in commit 5d30273a8741d2c141.
This patch only changes create_temp_filename() to create_temp_file()
in the new function introduced by commit a3982181e284f8c5c8f.
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
(cherry picked from commit 926d1662e4d9e14b50eddec993b2f4e0209c0646)
David Sommerseth authored on 2010/04/23 06:29:34Showing 1 changed files
| ... | ... |
@@ -714,7 +714,7 @@ get_peer_cert(X509_STORE_CTX *ctx, const char *tmp_dir, struct gc_arena *gc) |
| 714 | 714 |
} |
| 715 | 715 |
|
| 716 | 716 |
/* create tmp file to store peer cert */ |
| 717 |
- peercert_filename = create_temp_filename (tmp_dir, "pcf", gc); |
|
| 717 |
+ peercert_filename = create_temp_file (tmp_dir, "pcf", gc); |
|
| 718 | 718 |
|
| 719 | 719 |
/* write peer-cert in tmp-file */ |
| 720 | 720 |
peercert_file = fopen(peercert_filename, "w+"); |