From a4d5a4be7539318d5c203a9922c63fa66830d649 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Tue, 9 Feb 2016 14:18:37 -0800 Subject: [PATCH] Correct/add copyright statements --- .../gtest/test/gtest-test-part_test.cc | 26 +++++++++++++++++++ java/code/src/org/keyczar/GenericKeyczar.java | 16 ++++++++++++ .../src/org/keyczar/ImportedKeyReader.java | 16 ++++++++++++ .../org/keyczar/KeyczarToolKeyParameters.java | 16 ++++++++++++ .../src/org/keyczar/MockKeyczarReader.java | 16 ++++++++++++ java/code/src/org/keyczar/StreamQueue.java | 18 +++++++++++-- java/code/src/org/keyczar/i18n/Messages.java | 18 ++++++++++++- .../code/src/org/keyczar/interop/Creator.java | 16 ++++++++++++ .../src/org/keyczar/interop/Generator.java | 16 ++++++++++++ .../code/src/org/keyczar/interop/Interop.java | 16 ++++++++++++ .../org/keyczar/interop/InteropCommand.java | 18 ++++++++++++- java/code/src/org/keyczar/interop/Tester.java | 16 ++++++++++++ .../operations/AttachedSignOperation.java | 16 ++++++++++++ .../interop/operations/EncryptOperation.java | 16 ++++++++++++ .../interop/operations/SignOperation.java | 16 ++++++++++++ .../operations/SignedSessionOperation.java | 16 ++++++++++++ .../operations/UnversionedSignOperation.java | 16 ++++++++++++ .../keyczar/keyparams/AesKeyParameters.java | 16 +++++++++++- .../org/keyczar/keyparams/KeyParameters.java | 16 ++++++++++++ .../keyczar/keyparams/RsaKeyParameters.java | 16 ++++++++++++ java/code/src/org/keyczar/util/Clock.java | 16 ++++++++++++ .../src/org/keyczar/util/SystemClock.java | 16 ++++++++++++ .../testdata/certificates/build_certs_data.sh | 17 +++++++++--- .../code/tests/org/keyczar/KeyExportTest.java | 16 +++++++++++- 24 files changed, 392 insertions(+), 9 deletions(-) diff --git a/cpp/src/testing/gtest/test/gtest-test-part_test.cc b/cpp/src/testing/gtest/test/gtest-test-part_test.cc index f9e2e5d3..f3cb94fb 100644 --- a/cpp/src/testing/gtest/test/gtest-test-part_test.cc +++ b/cpp/src/testing/gtest/test/gtest-test-part_test.cc @@ -1,5 +1,31 @@ // Copyright 2008 Google Inc. All Rights Reserved. // Author: mheule@google.com (Markus Heule) +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * 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 +// 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 +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// 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. #include diff --git a/java/code/src/org/keyczar/GenericKeyczar.java b/java/code/src/org/keyczar/GenericKeyczar.java index 903ea28a..f7e34266 100644 --- a/java/code/src/org/keyczar/GenericKeyczar.java +++ b/java/code/src/org/keyczar/GenericKeyczar.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar; import org.keyczar.enums.KeyPurpose; diff --git a/java/code/src/org/keyczar/ImportedKeyReader.java b/java/code/src/org/keyczar/ImportedKeyReader.java index e95af761..0fcd9d15 100644 --- a/java/code/src/org/keyczar/ImportedKeyReader.java +++ b/java/code/src/org/keyczar/ImportedKeyReader.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar; import org.keyczar.annotations.Experimental; diff --git a/java/code/src/org/keyczar/KeyczarToolKeyParameters.java b/java/code/src/org/keyczar/KeyczarToolKeyParameters.java index 340eec18..53a3dec4 100644 --- a/java/code/src/org/keyczar/KeyczarToolKeyParameters.java +++ b/java/code/src/org/keyczar/KeyczarToolKeyParameters.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar; import org.keyczar.enums.Flag; diff --git a/java/code/src/org/keyczar/MockKeyczarReader.java b/java/code/src/org/keyczar/MockKeyczarReader.java index 4622a6ce..5cc606c3 100644 --- a/java/code/src/org/keyczar/MockKeyczarReader.java +++ b/java/code/src/org/keyczar/MockKeyczarReader.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar; diff --git a/java/code/src/org/keyczar/StreamQueue.java b/java/code/src/org/keyczar/StreamQueue.java index 14090037..e648d94e 100644 --- a/java/code/src/org/keyczar/StreamQueue.java +++ b/java/code/src/org/keyczar/StreamQueue.java @@ -1,4 +1,18 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright 2012 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.keyczar; @@ -15,4 +29,4 @@ */ class StreamQueue extends ConcurrentLinkedQueue { private static final long serialVersionUID = 4914617278167817144L; -} \ No newline at end of file +} diff --git a/java/code/src/org/keyczar/i18n/Messages.java b/java/code/src/org/keyczar/i18n/Messages.java index f51b975c..0cd25e75 100644 --- a/java/code/src/org/keyczar/i18n/Messages.java +++ b/java/code/src/org/keyczar/i18n/Messages.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.i18n; import java.text.MessageFormat; @@ -34,4 +50,4 @@ public static String getString(String key, Object... params) { return '!' + key + '!'; } } -} \ No newline at end of file +} diff --git a/java/code/src/org/keyczar/interop/Creator.java b/java/code/src/org/keyczar/interop/Creator.java index 5a5d24be..42cb2d13 100644 --- a/java/code/src/org/keyczar/interop/Creator.java +++ b/java/code/src/org/keyczar/interop/Creator.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop; import org.json.JSONArray; diff --git a/java/code/src/org/keyczar/interop/Generator.java b/java/code/src/org/keyczar/interop/Generator.java index d24e502c..028be0f8 100644 --- a/java/code/src/org/keyczar/interop/Generator.java +++ b/java/code/src/org/keyczar/interop/Generator.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop; import org.json.JSONException; diff --git a/java/code/src/org/keyczar/interop/Interop.java b/java/code/src/org/keyczar/interop/Interop.java index 060807d1..c965a295 100644 --- a/java/code/src/org/keyczar/interop/Interop.java +++ b/java/code/src/org/keyczar/interop/Interop.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop; import org.json.JSONException; diff --git a/java/code/src/org/keyczar/interop/InteropCommand.java b/java/code/src/org/keyczar/interop/InteropCommand.java index 4ecb6152..e17bd5dc 100644 --- a/java/code/src/org/keyczar/interop/InteropCommand.java +++ b/java/code/src/org/keyczar/interop/InteropCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop; import org.keyczar.i18n.Messages; @@ -35,4 +51,4 @@ public static InteropCommand getCommand(String command) { throw new IllegalArgumentException( Messages.getString("Command.UnknownCommand", command)); } -} \ No newline at end of file +} diff --git a/java/code/src/org/keyczar/interop/Tester.java b/java/code/src/org/keyczar/interop/Tester.java index b1c20f62..5e295f51 100644 --- a/java/code/src/org/keyczar/interop/Tester.java +++ b/java/code/src/org/keyczar/interop/Tester.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop; import org.json.JSONException; diff --git a/java/code/src/org/keyczar/interop/operations/AttachedSignOperation.java b/java/code/src/org/keyczar/interop/operations/AttachedSignOperation.java index 36fb7569..f15c2219 100644 --- a/java/code/src/org/keyczar/interop/operations/AttachedSignOperation.java +++ b/java/code/src/org/keyczar/interop/operations/AttachedSignOperation.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop.operations; import org.keyczar.Signer; diff --git a/java/code/src/org/keyczar/interop/operations/EncryptOperation.java b/java/code/src/org/keyczar/interop/operations/EncryptOperation.java index 00c3e96f..ffa17b29 100644 --- a/java/code/src/org/keyczar/interop/operations/EncryptOperation.java +++ b/java/code/src/org/keyczar/interop/operations/EncryptOperation.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop.operations; import org.keyczar.Crypter; diff --git a/java/code/src/org/keyczar/interop/operations/SignOperation.java b/java/code/src/org/keyczar/interop/operations/SignOperation.java index 6bea697f..1fb4b2c1 100644 --- a/java/code/src/org/keyczar/interop/operations/SignOperation.java +++ b/java/code/src/org/keyczar/interop/operations/SignOperation.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop.operations; import org.keyczar.Signer; diff --git a/java/code/src/org/keyczar/interop/operations/SignedSessionOperation.java b/java/code/src/org/keyczar/interop/operations/SignedSessionOperation.java index 56096e25..79d2dc57 100644 --- a/java/code/src/org/keyczar/interop/operations/SignedSessionOperation.java +++ b/java/code/src/org/keyczar/interop/operations/SignedSessionOperation.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop.operations; import org.json.JSONException; diff --git a/java/code/src/org/keyczar/interop/operations/UnversionedSignOperation.java b/java/code/src/org/keyczar/interop/operations/UnversionedSignOperation.java index b14028c3..3c88ce0d 100644 --- a/java/code/src/org/keyczar/interop/operations/UnversionedSignOperation.java +++ b/java/code/src/org/keyczar/interop/operations/UnversionedSignOperation.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.interop.operations; import org.keyczar.UnversionedSigner; diff --git a/java/code/src/org/keyczar/keyparams/AesKeyParameters.java b/java/code/src/org/keyczar/keyparams/AesKeyParameters.java index cc02aa72..93868b07 100644 --- a/java/code/src/org/keyczar/keyparams/AesKeyParameters.java +++ b/java/code/src/org/keyczar/keyparams/AesKeyParameters.java @@ -1,4 +1,18 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.keyczar.keyparams; diff --git a/java/code/src/org/keyczar/keyparams/KeyParameters.java b/java/code/src/org/keyczar/keyparams/KeyParameters.java index f3326f2e..57425e99 100644 --- a/java/code/src/org/keyczar/keyparams/KeyParameters.java +++ b/java/code/src/org/keyczar/keyparams/KeyParameters.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.keyparams; import org.keyczar.exceptions.KeyczarException; diff --git a/java/code/src/org/keyczar/keyparams/RsaKeyParameters.java b/java/code/src/org/keyczar/keyparams/RsaKeyParameters.java index 5a136d25..64e0465f 100644 --- a/java/code/src/org/keyczar/keyparams/RsaKeyParameters.java +++ b/java/code/src/org/keyczar/keyparams/RsaKeyParameters.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.keyparams; import org.keyczar.enums.RsaPadding; diff --git a/java/code/src/org/keyczar/util/Clock.java b/java/code/src/org/keyczar/util/Clock.java index 39bd1b33..a5c22a89 100644 --- a/java/code/src/org/keyczar/util/Clock.java +++ b/java/code/src/org/keyczar/util/Clock.java @@ -1,3 +1,19 @@ +/* + * Copyright 2011 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.util; public interface Clock { diff --git a/java/code/src/org/keyczar/util/SystemClock.java b/java/code/src/org/keyczar/util/SystemClock.java index f33fde05..c4bf3cda 100644 --- a/java/code/src/org/keyczar/util/SystemClock.java +++ b/java/code/src/org/keyczar/util/SystemClock.java @@ -1,3 +1,19 @@ +/* + * Copyright 2011 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.keyczar.util; public class SystemClock implements Clock { diff --git a/java/code/testdata/certificates/build_certs_data.sh b/java/code/testdata/certificates/build_certs_data.sh index f612e0fa..31bbfe3a 100755 --- a/java/code/testdata/certificates/build_certs_data.sh +++ b/java/code/testdata/certificates/build_certs_data.sh @@ -1,12 +1,23 @@ #!/bin/sh # -# Copyright 2011 Google Inc. All Rights Reserved +# Copyright 2012 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # -# Author: swillden@google.com (Shawn Willden) # # This script was used to generate all of the test keys and certificatees # in testdata/certificates. It is included here primarily for documentation -# purposes, but could be used to regenerate the keys and certs if requited. +# purposes, but could be used to regenerate the keys and certs if required. KEYCZART=../../../../cpp/src/scons-out/dbg-linux/staging/keyczart OPENSSL=openssl diff --git a/java/code/tests/org/keyczar/KeyExportTest.java b/java/code/tests/org/keyczar/KeyExportTest.java index 77f0f431..1fd2810f 100644 --- a/java/code/tests/org/keyczar/KeyExportTest.java +++ b/java/code/tests/org/keyczar/KeyExportTest.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright 2011 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.keyczar;