diff options
| author | Bernhard Schmidt <berni@debian.org> | 2017-12-30 22:21:14 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2017-12-30 22:21:14 +0100 |
| commit | 166ec510cb88cc1213ba6f441ffb372836fbddd3 (patch) | |
| tree | 8a8160ebeff4eaa8924367dbca91ff89fccbbb2d /sample/sample-plugins | |
| parent | 1e5f64f1519f3e43bdd34e2975c9c97840779592 (diff) | |
| parent | 75286879ecd00a15e21cb9126643fef0316bd47f (diff) | |
Merge tag 'debian/2.4.4-2' into stretch-backports
openvpn Debian release 2.4.4-2
Diffstat (limited to 'sample/sample-plugins')
| -rw-r--r-- | sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c | 5 | ||||
| -rw-r--r-- | sample/sample-plugins/log/log_v3.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c b/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c index 226eea6..c483907 100644 --- a/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c +++ b/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c @@ -142,9 +142,8 @@ session_user_set(struct session *sess, X509 *x509) { continue; } - /* bug in OpenSSL 0.9.6b ASN1_STRING_to_UTF8 requires this workaround */ - unsigned char *buf = (unsigned char *)1; - if (ASN1_STRING_to_UTF8(&buf, val) <= 0) + unsigned char *buf = NULL; + if (ASN1_STRING_to_UTF8(&buf, val) < 0) { continue; } diff --git a/sample/sample-plugins/log/log_v3.c b/sample/sample-plugins/log/log_v3.c index 8b537dd..f913a19 100644 --- a/sample/sample-plugins/log/log_v3.c +++ b/sample/sample-plugins/log/log_v3.c @@ -227,8 +227,7 @@ x509_print_info(X509 *x509crt) { continue; } - buf = (unsigned char *)1; /* bug in OpenSSL 0.9.6b ASN1_STRING_to_UTF8 requires this workaround */ - if (ASN1_STRING_to_UTF8(&buf, val) <= 0) + if (ASN1_STRING_to_UTF8(&buf, val) < 0) { continue; } |