summaryrefslogtreecommitdiff
path: root/mysys_ssl
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:47:26 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:54:04 +0300
commit26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch)
tree7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /mysys_ssl
parent8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff)
parentcb248f880619431850e5638009a6098048050edf (diff)
downloadmariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysys_ssl')
-rw-r--r--mysys_ssl/CMakeLists.txt2
-rw-r--r--mysys_ssl/my_crypt.cc2
-rw-r--r--mysys_ssl/my_md5.cc2
-rw-r--r--mysys_ssl/my_sha.ic2
-rw-r--r--mysys_ssl/my_sha1.cc2
-rw-r--r--mysys_ssl/my_sha224.cc2
-rw-r--r--mysys_ssl/my_sha256.cc2
-rw-r--r--mysys_ssl/my_sha384.cc2
-rw-r--r--mysys_ssl/my_sha512.cc2
-rw-r--r--mysys_ssl/yassl.cc2
10 files changed, 10 insertions, 10 deletions
diff --git a/mysys_ssl/CMakeLists.txt b/mysys_ssl/CMakeLists.txt
index f8a767ed6f3..86749128664 100644
--- a/mysys_ssl/CMakeLists.txt
+++ b/mysys_ssl/CMakeLists.txt
@@ -11,7 +11,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/mysys_ssl
diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc
index 2d6f5188034..65dd5cd769e 100644
--- a/mysys_ssl/my_crypt.cc
+++ b/mysys_ssl/my_crypt.cc
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <string.h>
diff --git a/mysys_ssl/my_md5.cc b/mysys_ssl/my_md5.cc
index 359bcd49ec6..85490c1de77 100644
--- a/mysys_ssl/my_md5.cc
+++ b/mysys_ssl/my_md5.cc
@@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/mysys_ssl/my_sha.ic b/mysys_ssl/my_sha.ic
index e4433b49a0f..97344dc0415 100644
--- a/mysys_ssl/my_sha.ic
+++ b/mysys_ssl/my_sha.ic
@@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/mysys_ssl/my_sha1.cc b/mysys_ssl/my_sha1.cc
index dc6a7a46179..b53e214468d 100644
--- a/mysys_ssl/my_sha1.cc
+++ b/mysys_ssl/my_sha1.cc
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#define NUM 1
diff --git a/mysys_ssl/my_sha224.cc b/mysys_ssl/my_sha224.cc
index 7e8b481256b..200b6ed161c 100644
--- a/mysys_ssl/my_sha224.cc
+++ b/mysys_ssl/my_sha224.cc
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#define NUM 224
diff --git a/mysys_ssl/my_sha256.cc b/mysys_ssl/my_sha256.cc
index 8c1a4662009..1562809f91a 100644
--- a/mysys_ssl/my_sha256.cc
+++ b/mysys_ssl/my_sha256.cc
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#define NUM 256
diff --git a/mysys_ssl/my_sha384.cc b/mysys_ssl/my_sha384.cc
index 3bad6b39248..6bb64470105 100644
--- a/mysys_ssl/my_sha384.cc
+++ b/mysys_ssl/my_sha384.cc
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#define NUM 384
diff --git a/mysys_ssl/my_sha512.cc b/mysys_ssl/my_sha512.cc
index 8077efd3b57..1047d0dbe46 100644
--- a/mysys_ssl/my_sha512.cc
+++ b/mysys_ssl/my_sha512.cc
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#define NUM 512
diff --git a/mysys_ssl/yassl.cc b/mysys_ssl/yassl.cc
index 4e9c21ebfd1..96b6f6867fe 100644
--- a/mysys_ssl/yassl.cc
+++ b/mysys_ssl/yassl.cc
@@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
The very minimal subset of OpenSSL's EVP* functions.