summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authormatthew <>2014-05-09 20:45:49 +0000
committermatthew <>2014-05-09 20:45:49 +0000
commitb93035a65c17115b15e09a232cdc8b12bdd7c0b9 (patch)
treeeb7ef37138b62bb3d9a38dad5693c87ce7f05453 /src/lib
parent034e46d2214abda456e015a08e0df30b0029f889 (diff)
downloadopenbsd-b93035a65c17115b15e09a232cdc8b12bdd7c0b9.tar.gz
openbsd-b93035a65c17115b15e09a232cdc8b12bdd7c0b9.tar.bz2
openbsd-b93035a65c17115b15e09a232cdc8b12bdd7c0b9.zip
Replace Apache v2 license with ISC license.
Thanks to Google for agreeing to offer the code under more agreeable licensing terms!
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp224.c24
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp256.c24
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp521.c24
-rw-r--r--src/lib/libcrypto/ec/ecp_nistputil.c28
-rw-r--r--src/lib/libssl/src/crypto/ec/ecp_nistp224.c24
-rw-r--r--src/lib/libssl/src/crypto/ec/ecp_nistp256.c24
-rw-r--r--src/lib/libssl/src/crypto/ec/ecp_nistp521.c24
-rw-r--r--src/lib/libssl/src/crypto/ec/ecp_nistputil.c28
8 files changed, 100 insertions, 100 deletions
diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c
index 7593b3c440..29ff2fc1f1 100644
--- a/src/lib/libcrypto/ec/ecp_nistp224.c
+++ b/src/lib/libcrypto/ec/ecp_nistp224.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Emilia Kasper (Google) for the OpenSSL project. 3 * Written by Emilia Kasper (Google) for the OpenSSL project.
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License");
8 *
9 * you may not use this file except in compliance with the License.
10 * You may obtain a copy of the License at
11 * 7 *
12 * http://www.apache.org/licenses/LICENSE-2.0 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies.
13 * 11 *
14 * Unless required by applicable law or agreed to in writing, software 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
15 * distributed under the License is distributed on an "AS IS" BASIS, 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
17 * See the License for the specific language governing permissions and 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
18 * limitations under the License. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c
index 1ff63bbbcc..85f370cadd 100644
--- a/src/lib/libcrypto/ec/ecp_nistp256.c
+++ b/src/lib/libcrypto/ec/ecp_nistp256.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License");
8 *
9 * you may not use this file except in compliance with the License.
10 * You may obtain a copy of the License at
11 * 7 *
12 * http://www.apache.org/licenses/LICENSE-2.0 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies.
13 * 11 *
14 * Unless required by applicable law or agreed to in writing, software 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
15 * distributed under the License is distributed on an "AS IS" BASIS, 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
17 * See the License for the specific language governing permissions and 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
18 * limitations under the License. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c
index 53a10aa1b9..9f7a2c6417 100644
--- a/src/lib/libcrypto/ec/ecp_nistp521.c
+++ b/src/lib/libcrypto/ec/ecp_nistp521.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License");
8 *
9 * you may not use this file except in compliance with the License.
10 * You may obtain a copy of the License at
11 * 7 *
12 * http://www.apache.org/licenses/LICENSE-2.0 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies.
13 * 11 *
14 * Unless required by applicable law or agreed to in writing, software 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
15 * distributed under the License is distributed on an "AS IS" BASIS, 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
17 * See the License for the specific language governing permissions and 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
18 * limitations under the License. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
diff --git a/src/lib/libcrypto/ec/ecp_nistputil.c b/src/lib/libcrypto/ec/ecp_nistputil.c
index 0312fb16ad..28fecf8b6e 100644
--- a/src/lib/libcrypto/ec/ecp_nistputil.c
+++ b/src/lib/libcrypto/ec/ecp_nistputil.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Bodo Moeller for the OpenSSL project. 3 * Written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 *
8 * 8 * Permission to use, copy, modify, and distribute this software for any
9 * you may not use this file except in compliance with the License. 9 * purpose with or without fee is hereby granted, provided that the above
10 * You may obtain a copy of the License at 10 * copyright notice and this permission notice appear in all copies.
11 * 11 *
12 * http://www.apache.org/licenses/LICENSE-2.0 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
13 * 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
14 * Unless required by applicable law or agreed to in writing, software 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
15 * distributed under the License is distributed on an "AS IS" BASIS, 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * See the License for the specific language governing permissions and 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * limitations under the License. 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21#include <openssl/opensslconf.h> 21#include <openssl/opensslconf.h>
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp224.c b/src/lib/libssl/src/crypto/ec/ecp_nistp224.c
index 7593b3c440..29ff2fc1f1 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nistp224.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nistp224.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Emilia Kasper (Google) for the OpenSSL project. 3 * Written by Emilia Kasper (Google) for the OpenSSL project.
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License");
8 *
9 * you may not use this file except in compliance with the License.
10 * You may obtain a copy of the License at
11 * 7 *
12 * http://www.apache.org/licenses/LICENSE-2.0 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies.
13 * 11 *
14 * Unless required by applicable law or agreed to in writing, software 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
15 * distributed under the License is distributed on an "AS IS" BASIS, 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
17 * See the License for the specific language governing permissions and 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
18 * limitations under the License. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp256.c b/src/lib/libssl/src/crypto/ec/ecp_nistp256.c
index 1ff63bbbcc..85f370cadd 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nistp256.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nistp256.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License");
8 *
9 * you may not use this file except in compliance with the License.
10 * You may obtain a copy of the License at
11 * 7 *
12 * http://www.apache.org/licenses/LICENSE-2.0 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies.
13 * 11 *
14 * Unless required by applicable law or agreed to in writing, software 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
15 * distributed under the License is distributed on an "AS IS" BASIS, 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
17 * See the License for the specific language governing permissions and 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
18 * limitations under the License. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp521.c b/src/lib/libssl/src/crypto/ec/ecp_nistp521.c
index 53a10aa1b9..9f7a2c6417 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nistp521.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nistp521.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License");
8 *
9 * you may not use this file except in compliance with the License.
10 * You may obtain a copy of the License at
11 * 7 *
12 * http://www.apache.org/licenses/LICENSE-2.0 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies.
13 * 11 *
14 * Unless required by applicable law or agreed to in writing, software 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
15 * distributed under the License is distributed on an "AS IS" BASIS, 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
17 * See the License for the specific language governing permissions and 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
18 * limitations under the License. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistputil.c b/src/lib/libssl/src/crypto/ec/ecp_nistputil.c
index 0312fb16ad..28fecf8b6e 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nistputil.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nistputil.c
@@ -2,20 +2,20 @@
2/* 2/*
3 * Written by Bodo Moeller for the OpenSSL project. 3 * Written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
5/* Copyright 2011 Google Inc. 5/*
6 * 6 * Copyright (c) 2011 Google Inc.
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 *
8 * 8 * Permission to use, copy, modify, and distribute this software for any
9 * you may not use this file except in compliance with the License. 9 * purpose with or without fee is hereby granted, provided that the above
10 * You may obtain a copy of the License at 10 * copyright notice and this permission notice appear in all copies.
11 * 11 *
12 * http://www.apache.org/licenses/LICENSE-2.0 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
13 * 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
14 * Unless required by applicable law or agreed to in writing, software 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
15 * distributed under the License is distributed on an "AS IS" BASIS, 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
16 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * See the License for the specific language governing permissions and 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * limitations under the License. 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21#include <openssl/opensslconf.h> 21#include <openssl/opensslconf.h>