summaryrefslogtreecommitdiffstats
path: root/src/openvpn/pkcs11_polarssl.c
diff options
context:
space:
mode:
authorAlon Bar-Lev <alon.barlev@gmail.com>2012-04-01 16:46:28 +0300
committerDavid Sommerseth <davids@redhat.com>2012-04-02 11:54:59 +0200
commit75b49e406430299b187964744f82e50a9035a0d3 (patch)
tree4d9dc4a170a9f414632d76a81ae90f854fd4151b /src/openvpn/pkcs11_polarssl.c
parent12e46092bad76b88bb7439e1c1666e987669cfb1 (diff)
downloadopenvpn-75b49e406430299b187964744f82e50a9035a0d3.tar.gz
openvpn-75b49e406430299b187964744f82e50a9035a0d3.tar.xz
openvpn-75b49e406430299b187964744f82e50a9035a0d3.zip
cleanup: gc usage
Cleanup of "Use the garbage collector when retrieving x509 fields" patch series. Discussed at [1]. There should be an effort to produce common function prologue and epilogue, so that cleanups will be done at single point. [1] http://comments.gmane.org/gmane.network.openvpn.devel/5401 Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Acked-by: Adriaan de Jong <dejong@fox-it.com> Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/pkcs11_polarssl.c')
-rw-r--r--src/openvpn/pkcs11_polarssl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/openvpn/pkcs11_polarssl.c b/src/openvpn/pkcs11_polarssl.c
index f5b7b8b..03b2bab 100644
--- a/src/openvpn/pkcs11_polarssl.c
+++ b/src/openvpn/pkcs11_polarssl.c
@@ -75,7 +75,7 @@ cleanup:
char *
pkcs11_certificate_dn (pkcs11h_certificate_t cert, struct gc_arena *gc)
{
- int ret = 1;
+ char *ret = NULL;
char dn[1024] = {0};
x509_cert polar_cert = {0};
@@ -90,14 +90,12 @@ pkcs11_certificate_dn (pkcs11h_certificate_t cert, struct gc_arena *gc)
goto cleanup;
}
- ret = 0;
+ ret = string_alloc(dn, gc);
cleanup:
x509_free(&polar_cert);
- if (ret == 0)
- return string_alloc(dn, gc);
- return NULL;
+ return ret;
}
int