From 13b8d2c1e99e343686525b8b781f2a19f43c4f7e Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Tue, 30 Oct 2018 21:49:30 +0100 Subject: [PATCH] Included original copyright statement in bootutil files --- lib/bootutil/src/bootutil_misc.c | 21 +++++++++++++++++++++ lib/bootutil/src/image_validate.c | 20 ++++++++++++++++++++ lib/bootutil/src/loader.c | 20 ++++++++++++++++++++ lib/wolfssl | 2 +- 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/lib/bootutil/src/bootutil_misc.c b/lib/bootutil/src/bootutil_misc.c index 2be64d7a..d7746de7 100644 --- a/lib/bootutil/src/bootutil_misc.c +++ b/lib/bootutil/src/bootutil_misc.c @@ -17,6 +17,27 @@ * 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 Street, Fifth Floor, Boston, MA 02110-1335, USA + * + * **** This file incorporates work covered by the following copyright and **** + * **** permission notice: **** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + * */ #include diff --git a/lib/bootutil/src/image_validate.c b/lib/bootutil/src/image_validate.c index 9135db7e..16131273 100644 --- a/lib/bootutil/src/image_validate.c +++ b/lib/bootutil/src/image_validate.c @@ -17,6 +17,26 @@ * 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 Street, Fifth Floor, Boston, MA 02110-1335, USA + * + * **** This file incorporates work covered by the following copyright and **** + * **** permission notice: **** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ #include diff --git a/lib/bootutil/src/loader.c b/lib/bootutil/src/loader.c index 8d0a1e61..a9edc3d3 100644 --- a/lib/bootutil/src/loader.c +++ b/lib/bootutil/src/loader.c @@ -17,6 +17,26 @@ * 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 Street, Fifth Floor, Boston, MA 02110-1335, USA + * + * **** This file incorporates work covered by the following copyright and **** + * **** permission notice: **** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ /** diff --git a/lib/wolfssl b/lib/wolfssl index 9a0ecd4e..84fb23cf 160000 --- a/lib/wolfssl +++ b/lib/wolfssl @@ -1 +1 @@ -Subproject commit 9a0ecd4eb69d932aed46fb4b448492bcfdf28ea9 +Subproject commit 84fb23cfabd00a3ba2ae8f53665526c9f3844a48