diff options
author | delphij <delphij@FreeBSD.org> | 2016-03-03 07:30:55 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-03-03 07:30:55 +0000 |
commit | 3d2fb8e5e3653e0e150faeb838bc5929c7c5e8e8 (patch) | |
tree | 4b42d7ea8b3aedec1fcebae81bfd19d6ed63868d /crypto/openssl/crypto/x509/x509_def.c | |
parent | a4d15ab47c63b949c292515d36cc6e405d8e941c (diff) | |
download | FreeBSD-src-3d2fb8e5e3653e0e150faeb838bc5929c7c5e8e8.zip FreeBSD-src-3d2fb8e5e3653e0e150faeb838bc5929c7c5e8e8.tar.gz |
Fix multiple OpenSSL vulnerabilities.
Security: FreeBSD-SA-16:12.openssl
Approved by: so
Diffstat (limited to 'crypto/openssl/crypto/x509/x509_def.c')
-rw-r--r-- | crypto/openssl/crypto/x509/x509_def.c | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/crypto/openssl/crypto/x509/x509_def.c b/crypto/openssl/crypto/x509/x509_def.c index e0ac151a..25c5537 100644 --- a/crypto/openssl/crypto/x509/x509_def.c +++ b/crypto/openssl/crypto/x509/x509_def.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -62,20 +62,31 @@ #include <openssl/x509.h> const char *X509_get_default_private_dir(void) - { return(X509_PRIVATE_DIR); } - +{ + return (X509_PRIVATE_DIR); +} + const char *X509_get_default_cert_area(void) - { return(X509_CERT_AREA); } +{ + return (X509_CERT_AREA); +} const char *X509_get_default_cert_dir(void) - { return(X509_CERT_DIR); } +{ + return (X509_CERT_DIR); +} const char *X509_get_default_cert_file(void) - { return(X509_CERT_FILE); } +{ + return (X509_CERT_FILE); +} const char *X509_get_default_cert_dir_env(void) - { return(X509_CERT_DIR_EVP); } +{ + return (X509_CERT_DIR_EVP); +} const char *X509_get_default_cert_file_env(void) - { return(X509_CERT_FILE_EVP); } - +{ + return (X509_CERT_FILE_EVP); +} |