aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-04-22 23:29:34 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-10-21 21:27:16 +0200
commit6cc43bf573700b2391ae462651190a3b209da2c8 (patch)
tree1545a60a71ddcbaf1bd65c279b7d79f0a8362737
parentFixed static defined length check to use sizeof() (diff)
downloadopenvpn-6cc43bf573700b2391ae462651190a3b209da2c8.tar.xz
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)
Diffstat (limited to '')
-rw-r--r--ssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl.c b/ssl.c
index ed2f69d..1f93732 100644
--- a/ssl.c
+++ b/ssl.c
@@ -714,7 +714,7 @@ get_peer_cert(X509_STORE_CTX *ctx, const char *tmp_dir, struct gc_arena *gc)
}
/* create tmp file to store peer cert */
- peercert_filename = create_temp_filename (tmp_dir, "pcf", gc);
+ peercert_filename = create_temp_file (tmp_dir, "pcf", gc);
/* write peer-cert in tmp-file */
peercert_file = fopen(peercert_filename, "w+");