diff options
| -rw-r--r-- | src/lib/libcrypto/dso/dso.h | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509v3.cnf | 2 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/dso/dso.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/dso/dso.h b/src/lib/libcrypto/dso/dso.h index 7bd138bc3b..52d391c0a4 100644 --- a/src/lib/libcrypto/dso/dso.h +++ b/src/lib/libcrypto/dso/dso.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dso.h,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: dso.h,v 1.10 2014/08/14 17:55:28 tobias Exp $ */ |
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -74,7 +74,7 @@ extern "C" { | |||
| 74 | * typical for the platform (more specifically the DSO_METHOD) using the | 74 | * typical for the platform (more specifically the DSO_METHOD) using the |
| 75 | * dso_name_converter function of the method. Eg. win32 will transform "blah" | 75 | * dso_name_converter function of the method. Eg. win32 will transform "blah" |
| 76 | * into "blah.dll", and dlfcn will transform it into "libblah.so". The | 76 | * into "blah.dll", and dlfcn will transform it into "libblah.so". The |
| 77 | * behaviour can be overriden by setting the name_converter callback in the DSO | 77 | * behaviour can be overridden by setting the name_converter callback in the DSO |
| 78 | * object (using DSO_set_name_converter()). This callback could even utilise | 78 | * object (using DSO_set_name_converter()). This callback could even utilise |
| 79 | * the DSO_METHOD's converter too if it only wants to override behaviour for | 79 | * the DSO_METHOD's converter too if it only wants to override behaviour for |
| 80 | * one or two possible DSO methods. However, the following flag can be set in a | 80 | * one or two possible DSO methods. However, the following flag can be set in a |
diff --git a/src/lib/libcrypto/x509v3.cnf b/src/lib/libcrypto/x509v3.cnf index 8c6b775da1..d12d732855 100644 --- a/src/lib/libcrypto/x509v3.cnf +++ b/src/lib/libcrypto/x509v3.cnf | |||
| @@ -7,7 +7,7 @@ CERTFQDN = nohost.nodomain | |||
| 7 | 7 | ||
| 8 | # This section should be referenced when building an x509v3 CA | 8 | # This section should be referenced when building an x509v3 CA |
| 9 | # Certificate. | 9 | # Certificate. |
| 10 | # The default path length and the key usage can be overriden | 10 | # The default path length and the key usage can be overridden |
| 11 | # modified by setting the CERTPATHLEN and CERTUSAGE environment | 11 | # modified by setting the CERTPATHLEN and CERTUSAGE environment |
| 12 | # variables. | 12 | # variables. |
| 13 | [x509v3_CA] | 13 | [x509v3_CA] |
diff --git a/src/lib/libssl/src/crypto/dso/dso.h b/src/lib/libssl/src/crypto/dso/dso.h index 7bd138bc3b..52d391c0a4 100644 --- a/src/lib/libssl/src/crypto/dso/dso.h +++ b/src/lib/libssl/src/crypto/dso/dso.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dso.h,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: dso.h,v 1.10 2014/08/14 17:55:28 tobias Exp $ */ |
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -74,7 +74,7 @@ extern "C" { | |||
| 74 | * typical for the platform (more specifically the DSO_METHOD) using the | 74 | * typical for the platform (more specifically the DSO_METHOD) using the |
| 75 | * dso_name_converter function of the method. Eg. win32 will transform "blah" | 75 | * dso_name_converter function of the method. Eg. win32 will transform "blah" |
| 76 | * into "blah.dll", and dlfcn will transform it into "libblah.so". The | 76 | * into "blah.dll", and dlfcn will transform it into "libblah.so". The |
| 77 | * behaviour can be overriden by setting the name_converter callback in the DSO | 77 | * behaviour can be overridden by setting the name_converter callback in the DSO |
| 78 | * object (using DSO_set_name_converter()). This callback could even utilise | 78 | * object (using DSO_set_name_converter()). This callback could even utilise |
| 79 | * the DSO_METHOD's converter too if it only wants to override behaviour for | 79 | * the DSO_METHOD's converter too if it only wants to override behaviour for |
| 80 | * one or two possible DSO methods. However, the following flag can be set in a | 80 | * one or two possible DSO methods. However, the following flag can be set in a |