diff options
| author | Adriaan de Jong <dejong@fox-it.com> | 2011-06-30 15:03:33 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2011-10-22 11:32:40 +0200 |
| commit | 3cb348e46e5e356eb7e1fe44d1e35f1152865e28 (patch) | |
| tree | 9f1f09ba6204190aa8d8a49d311be4b83f7a1b09 /ssl_verify_openssl.c | |
| parent | 83c49a3ef135141101b71037f315099d32219bbf (diff) | |
| download | openvpn-3cb348e46e5e356eb7e1fe44d1e35f1152865e28.tar.gz openvpn-3cb348e46e5e356eb7e1fe44d1e35f1152865e28.tar.xz openvpn-3cb348e46e5e356eb7e1fe44d1e35f1152865e28.zip | |
Minor cleanup in verify_cert:
- Removed envname variable
- Removed debug code
- Changed ERR_clear_error to tls_clear_error
- Changed verify_get_subject to match verify_get_serial more closely
Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'ssl_verify_openssl.c')
| -rw-r--r-- | ssl_verify_openssl.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/ssl_verify_openssl.c b/ssl_verify_openssl.c index 8bc49d7..a1b25d0 100644 --- a/ssl_verify_openssl.c +++ b/ssl_verify_openssl.c @@ -73,16 +73,6 @@ verify_callback (int preverify_ok, X509_STORE_CTX * ctx) return verify_cert(session, ctx->current_cert, ctx->error_depth); } -int -verify_get_subject (char **subject, X509 *cert) -{ - *subject = X509_NAME_oneline (X509_get_subject_name (cert), NULL, 0); - if (!*subject) - return 1; - - return 0; -} - #ifdef ENABLE_X509ALTUSERNAME static bool extract_x509_extension(X509 *cert, char *fieldname, char *out, int size) @@ -232,6 +222,20 @@ verify_free_serial (char *serial) OPENSSL_free(serial); } +char * +verify_get_subject (X509 *cert) +{ + return X509_NAME_oneline (X509_get_subject_name (cert), NULL, 0); +} + +void +verify_free_subject (char *subject) +{ + if (subject) + OPENSSL_free(subject); +} + + #ifdef ENABLE_X509_TRACK /* * setenv_x509_track function -- save X509 fields to environment, |