From dad5f8a3d51c8b12bfa0d2c635639fff9fad5155 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Fri, 29 Jun 2018 09:45:44 +0900 Subject: [PATCH] Make capitalization of term "OpenSSL" more consistent This includes code comments and documentation. No backpatch as this is cosmetic even if there are documentation changes which are user-facing. Author: Daniel Gustafsson Discussion: https://postgr.es/m/BB89928E-2BC7-489E-A5E4-6D204B3954CF@yesql.se --- contrib/pgcrypto/openssl.c | 2 +- doc/src/sgml/install-windows.sgml | 6 +++--- doc/src/sgml/release-8.2.sgml | 2 +- doc/src/sgml/release-8.3.sgml | 2 +- doc/src/sgml/release-8.4.sgml | 2 +- doc/src/sgml/release-9.2.sgml | 2 +- doc/src/sgml/release-9.3.sgml | 2 +- doc/src/sgml/release-9.4.sgml | 2 +- doc/src/sgml/release-9.5.sgml | 2 +- doc/src/sgml/release-9.6.sgml | 2 +- src/backend/libpq/be-secure-openssl.c | 6 +++--- src/interfaces/libpq/fe-secure-openssl.c | 2 +- src/test/ssl/Makefile | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index f71a933407d..7d686f39402 100644 --- a/contrib/pgcrypto/openssl.c +++ b/contrib/pgcrypto/openssl.c @@ -408,7 +408,7 @@ gen_ossl_encrypt(PX_Cipher *c, const uint8 *data, unsigned dlen, /* Blowfish */ /* - * Check if strong crypto is supported. Some openssl installations + * Check if strong crypto is supported. Some OpenSSL installations * support only short keys and unfortunately BF_set_key does not return any * error value. This function tests if is possible to use strong key. */ diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml index 99e9c7b78ee..02d2c6f846a 100644 --- a/doc/src/sgml/install-windows.sgml +++ b/doc/src/sgml/install-windows.sgml @@ -293,11 +293,11 @@ $ENV{MSBFLAGS}="/m"; - openssl + OpenSSL Required for SSL support. Binaries can be downloaded from - or source from . + or source from . @@ -348,7 +348,7 @@ $ENV{MSBFLAGS}="/m"; To use a server-side third party library such as python or - openssl, this library must also be + OpenSSL, this library must also be 64-bit. There is no support for loading a 32-bit library in a 64-bit server. Several of the third party libraries that PostgreSQL supports may only be available in 32-bit versions, in which case they cannot be used with diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml index 51239f9b9d9..d87c5bbd467 100644 --- a/doc/src/sgml/release-8.2.sgml +++ b/doc/src/sgml/release-8.2.sgml @@ -1705,7 +1705,7 @@ This is reportedly possible with some Windows versions of - openssl. + OpenSSL. diff --git a/doc/src/sgml/release-8.3.sgml b/doc/src/sgml/release-8.3.sgml index 2e10bc49827..021922966b3 100644 --- a/doc/src/sgml/release-8.3.sgml +++ b/doc/src/sgml/release-8.3.sgml @@ -3320,7 +3320,7 @@ This is reportedly possible with some Windows versions of - openssl. + OpenSSL. diff --git a/doc/src/sgml/release-8.4.sgml b/doc/src/sgml/release-8.4.sgml index 6e6efa3bd19..934f7203872 100644 --- a/doc/src/sgml/release-8.4.sgml +++ b/doc/src/sgml/release-8.4.sgml @@ -5661,7 +5661,7 @@ This is reportedly possible with some Windows versions of - openssl. + OpenSSL. diff --git a/doc/src/sgml/release-9.2.sgml b/doc/src/sgml/release-9.2.sgml index 1f2240f158d..3494ddb5cef 100644 --- a/doc/src/sgml/release-9.2.sgml +++ b/doc/src/sgml/release-9.2.sgml @@ -808,7 +808,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0'; - In MSVC builds, handle the case where the openssl + In MSVC builds, handle the case where the OpenSSL library is not within a VC subdirectory (Andrew Dunstan) diff --git a/doc/src/sgml/release-9.3.sgml b/doc/src/sgml/release-9.3.sgml index 4c063551d03..2990bc44ef5 100644 --- a/doc/src/sgml/release-9.3.sgml +++ b/doc/src/sgml/release-9.3.sgml @@ -1813,7 +1813,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0'; - In MSVC builds, handle the case where the openssl + In MSVC builds, handle the case where the OpenSSL library is not within a VC subdirectory (Andrew Dunstan) diff --git a/doc/src/sgml/release-9.4.sgml b/doc/src/sgml/release-9.4.sgml index 5c93f00e19b..57d51b7bd3e 100644 --- a/doc/src/sgml/release-9.4.sgml +++ b/doc/src/sgml/release-9.4.sgml @@ -2065,7 +2065,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700 - In MSVC builds, handle the case where the openssl + In MSVC builds, handle the case where the OpenSSL library is not within a VC subdirectory (Andrew Dunstan) diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml index cf7db406f89..2af76b7ad40 100644 --- a/doc/src/sgml/release-9.5.sgml +++ b/doc/src/sgml/release-9.5.sgml @@ -2283,7 +2283,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400 - In MSVC builds, handle the case where the openssl + In MSVC builds, handle the case where the OpenSSL library is not within a VC subdirectory (Andrew Dunstan) diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml index 541afa8ab17..b571fbd9b6a 100644 --- a/doc/src/sgml/release-9.6.sgml +++ b/doc/src/sgml/release-9.6.sgml @@ -3308,7 +3308,7 @@ Branch: REL9_3_STABLE [da30fa603] 2017-06-05 20:40:47 -0400 Branch: REL9_2_STABLE [f964a7c5a] 2017-06-05 20:41:01 -0400 --> - In MSVC builds, handle the case where the openssl + In MSVC builds, handle the case where the OpenSSL library is not within a VC subdirectory (Andrew Dunstan) diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 48b468f62ff..310e9ba348d 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -187,7 +187,7 @@ be_tls_init(bool isServerStart) SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); /* disallow SSL session tickets */ -#ifdef SSL_OP_NO_TICKET /* added in openssl 0.9.8f */ +#ifdef SSL_OP_NO_TICKET /* added in OpenSSL 0.9.8f */ SSL_CTX_set_options(context, SSL_OP_NO_TICKET); #endif @@ -638,7 +638,7 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor) * Private substitute BIO: this does the sending and receiving using send() and * recv() instead. This is so that we can enable and disable interrupts * just while calling recv(). We cannot have interrupts occurring while - * the bulk of openssl runs, because it uses malloc() and possibly other + * the bulk of OpenSSL runs, because it uses malloc() and possibly other * non-reentrant libc facilities. We also need to call send() and recv() * directly so it gets passed through the socket/signals layer on Win32. * @@ -736,7 +736,7 @@ my_BIO_s_socket(void) return my_bio_methods; } -/* This should exactly match openssl's SSL_set_fd except for using my BIO */ +/* This should exactly match OpenSSL's SSL_set_fd except for using my BIO */ static int my_SSL_set_fd(Port *port, int fd) { diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 43640e37996..045405e92bc 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -1588,7 +1588,7 @@ my_BIO_s_socket(void) return my_bio_methods; } -/* This should exactly match openssl's SSL_set_fd except for using my BIO */ +/* This should exactly match OpenSSL's SSL_set_fd except for using my BIO */ static int my_SSL_set_fd(PGconn *conn, int fd) { diff --git a/src/test/ssl/Makefile b/src/test/ssl/Makefile index df477f1d401..97389c90f8b 100644 --- a/src/test/ssl/Makefile +++ b/src/test/ssl/Makefile @@ -32,7 +32,7 @@ SSLFILES := $(CERTIFICATES:%=ssl/%.key) $(CERTIFICATES:%=ssl/%.crt) \ # This target generates all the key and certificate files. sslfiles: $(SSLFILES) -# Openssl requires a directory to put all generated certificates in. We don't +# OpenSSL requires a directory to put all generated certificates in. We don't # use this for anything, but we need a location. ssl/new_certs_dir: mkdir ssl/new_certs_dir