diff options
author | Craig Tiller <ctiller@google.com> | 2016-01-05 08:10:53 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-01-05 08:10:53 -0800 |
commit | 9b28987b661cfb55b705518e33b4ef98922733e1 (patch) | |
tree | f5ad7c490d445be54661cf781617d14b43831840 /src/core | |
parent | a5c5e3144e08d18fe51d9a1f378fd079bad4c1c3 (diff) | |
parent | e3b7beeb3843d706ed1dbdf756ec343ec2f17c44 (diff) |
Merge pull request #4615 from murgatroid99/backport_copyright_sanity_test
Backport copyright changes
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/security/jwt_verifier.c | 6 | ||||
-rw-r--r-- | src/core/security/jwt_verifier.h | 4 | ||||
-rw-r--r-- | src/core/transport/static_metadata.c | 10 | ||||
-rw-r--r-- | src/core/transport/static_metadata.h | 10 |
4 files changed, 17 insertions, 13 deletions
diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index 9de8482025..fafca661df 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -8,9 +8,9 @@ * met: * * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimser. + * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimser + * copyright notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. * * Neither the name of Google Inc. nor the names of its diff --git a/src/core/security/jwt_verifier.h b/src/core/security/jwt_verifier.h index 51ea036e4a..25613f03a0 100644 --- a/src/core/security/jwt_verifier.h +++ b/src/core/security/jwt_verifier.h @@ -8,9 +8,9 @@ * met: * * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimser. + * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimser + * copyright notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. * * Neither the name of Google Inc. nor the names of its diff --git a/src/core/transport/static_metadata.c b/src/core/transport/static_metadata.c index 6e42379eee..361fe5ede6 100644 --- a/src/core/transport/static_metadata.c +++ b/src/core/transport/static_metadata.c @@ -1,4 +1,5 @@ /* + * * Copyright 2015, Google Inc. * All rights reserved. * @@ -6,13 +7,13 @@ * modification, are permitted provided that the following conditions are * met: * - * * Redistributions of source code must retain the above copyright + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above + * * Redistributions in binary form must reproduce the above * copyright notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,8 +28,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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. + * */ - + /* * WARNING: Auto-generated code. * diff --git a/src/core/transport/static_metadata.h b/src/core/transport/static_metadata.h index 0e630b1b03..d951293c84 100644 --- a/src/core/transport/static_metadata.h +++ b/src/core/transport/static_metadata.h @@ -1,4 +1,5 @@ /* + * * Copyright 2015, Google Inc. * All rights reserved. * @@ -6,13 +7,13 @@ * modification, are permitted provided that the following conditions are * met: * - * * Redistributions of source code must retain the above copyright + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above + * * Redistributions in binary form must reproduce the above * copyright notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Google Inc. nor the names of its + * * Neither the name of Google Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,8 +28,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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. + * */ - + /* * WARNING: Auto-generated code. * |