Skip to content

Commit

Permalink
Update copyright headers to include all Open Enclave SDK contributors
Browse files Browse the repository at this point in the history
Per contribution of the project to Confidential Computing Consortium, update
all the copyright headers on source files to include all Open Enclave SDK
contributors. All copyright headers should now read:

```
Copyright (c) Open Enclave SDK contributors.
Licensed under the MIT License.
```

- Update scripts/check-license to enforce this new value on git commit.

Signed-off-by: Simon Leet <[email protected]>
  • Loading branch information
Simon Leet committed Nov 8, 2019
1 parent e3d9d5f commit 02428b8
Show file tree
Hide file tree
Showing 1,401 changed files with 1,437 additions and 1,436 deletions.
2 changes: 1 addition & 1 deletion .jenkins/Dockerfile.deploy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

FROM ubuntu:18.04
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/Dockerfile.full
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

#
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/Dockerfile.minimal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

ARG ubuntu_version=18.04
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def win2016CrossCompile(String build_type, String has_quote_provider = 'OFF') {
dir("build/X64-${build_type}") {

/* We need to copy nuget into the expected location
https://github.com/microsoft/openenclave/blob/a982b46cf440def8fb66e94f2622a4f81e2b350b/host/CMakeLists.txt#L188-L197 */
https://github.com/openenclave/openenclave/blob/a982b46cf440def8fb66e94f2622a4f81e2b350b/host/CMakeLists.txt#L188-L197 */

bat """
vcvars64.bat x64 && \
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/custom_label.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def win2016CrossCompile(String build_type, String has_quote_provider = 'OFF') {
dir("build/X64-${build_type}") {

/* We need to copy nuget into the expected location
https://github.com/microsoft/openenclave/blob/a982b46cf440def8fb66e94f2622a4f81e2b350b/host/CMakeLists.txt#L188-L197 */
https://github.com/openenclave/openenclave/blob/a982b46cf440def8fb66e94f2622a4f81e2b350b/host/CMakeLists.txt#L188-L197 */

bat """
vcvars64.bat x64 && \
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/provision/cleanup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

set -o errexit
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/provision/deploy-agent.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

set -o errexit
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/provision/register-agents.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

set -o errexit
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# NOTE: This is set here so that both `libcxx` and `musl` can use it
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/dlmalloc/update.make
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

all: update-dlmalloc
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libcxx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

include (ExternalProject)
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libcxx/__config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef __OPEN_ENCLAVE_LIBCXX_CONFIG
Expand Down
6 changes: 3 additions & 3 deletions 3rdparty/libcxx/__dso_handle.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>

const void *__dso_handle = NULL;
const void* __dso_handle = NULL;
2 changes: 1 addition & 1 deletion 3rdparty/libcxx/update.make
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# libcxx SVN revision
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libcxxrt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# Compile libcxx for Open Enclave. Some of these build rules emulate
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libcxxrt/update.make
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

all: update-libcxxrt
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libunwind/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

if (OE_SGX)
Expand Down
7 changes: 3 additions & 4 deletions 3rdparty/libunwind/Gstep.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#if defined(__clang__)
Expand All @@ -10,16 +10,15 @@
#endif

#include <libunwind.h>
#include "unwind_i.h"
#include <openenclave/enclave.h>
#include "unwind_i.h"

#undef unw_step
#define unw_step _ULx86_64_step


extern int _ULx86_64_step(unw_cursor_t* cursor);

// Wrapper for calling unw_step() throughout libunwind source. This
// Wrapper for calling unw_step() throughout libunwind source. This
// function checks whether the cursor is within the enclave image.
int __libunwind_unw_step(unw_cursor_t* cursor)
{
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libunwind/libunwind-common.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef _OE_LIBUNWIND_COMMON_H
Expand Down
23 changes: 11 additions & 12 deletions 3rdparty/libunwind/stubs.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef __OE_LIBUNWIND_STUBS_H
#define __OE_LIBUNWIND_STUBS_H

#if !defined(__ASSEMBLER__)

#include <pthread.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
#include <sys/mman.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>

// Disable use of adaptive mutexes, which are defined by GCC headers but not
// supported by MUSL pthreads. Note that libunwind is compiled with GCC headers
Expand Down Expand Up @@ -109,10 +109,9 @@ static __inline void* __libunwind_mmap(
return result;
}


static __inline int __libunwind_munmap(void* addr, size_t length)
{
extern void dlfree(void *ptr);
extern void dlfree(void* ptr);

if (!addr)
return -1;
Expand All @@ -129,8 +128,8 @@ static __inline int __libunwind_msync(void* addr, size_t length, int flags)
}

static __inline int __libunwind_mincore(
void* addr,
size_t length,
void* addr,
size_t length,
unsigned char* vec)
{
if (!addr || !vec)
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libunwind/update.make
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

#libunwind Version
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/mbedtls/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# Load the compiler info if we're cross compiling on Windows.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/mbedtls/mbedtls_hardware_poll.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#include <openenclave/enclave.h>
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/mbedtls/toolchain-clangw.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# Toolchain file used for cross-compiling using clang.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/mbedtls/update.make
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# mbedTLS library definitions
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/musl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# Copy MUSL headers to collector dir and wrap
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/musl/append-deprecations
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

##==============================================================================
Expand Down
23 changes: 13 additions & 10 deletions 3rdparty/musl/deprecations.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef _OE_LIBC_DEPRECATIONS_H
Expand All @@ -13,7 +13,9 @@
#include <bits/alltypes.h>

#if defined(__cplusplus)
#define OE_LIBC_EXTERN_C_BEGIN extern "C" {
#define OE_LIBC_EXTERN_C_BEGIN \
extern "C" \
{
#define OE_LIBC_EXTERN_C_END }
#else
#define OE_LIBC_EXTERN_C_BEGIN
Expand Down Expand Up @@ -44,10 +46,10 @@ OE_LIBC_EXTERN_C_BEGIN

OE_LIBC_DEPRECATED(OE_UNSUPPORTED_ENCLAVE_FUNCTION)
int pthread_create(
pthread_t *thread,
const pthread_attr_t *attr,
void *(*start_routine) (void *),
void *arg);
pthread_t* thread,
const pthread_attr_t* attr,
void* (*start_routine)(void*),
void* arg);

OE_LIBC_DEPRECATED(OE_UNSUPPORTED_ENCLAVE_FUNCTION)
int pthread_join(pthread_t thread, void** retval);
Expand All @@ -68,9 +70,9 @@ struct tm;

OE_LIBC_DEPRECATED(OE_UNSUPPORTED_ENCLAVE_FUNCTION)
size_t strftime(
char* s,
size_t maxparam,
const char* format,
char* s,
size_t maxparam,
const char* format,
const struct tm* tm);

OE_LIBC_DEPRECATED(OE_UNSUPPORTED_ENCLAVE_FUNCTION)
Expand All @@ -83,6 +85,7 @@ size_t strftime_l(

OE_LIBC_EXTERN_C_END

#endif /* !defined(OE_LIBC_SUPPRESS_DEPRECATIONS) && !defined(__ASSEMBLER__) */
#endif /* !defined(OE_LIBC_SUPPRESS_DEPRECATIONS) && !defined(__ASSEMBLER__) \
*/

#endif /* _OE_LIBC_DEPRECATIONS_H */
2 changes: 1 addition & 1 deletion 3rdparty/musl/patches/endian.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef _OE_MUSL_PATCHES_ENDIAN_H
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/musl/patches/pthread_aarch64.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef _OE_MUSL_PATCHES_PTHREAD_H
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/musl/patches/pthread_x86_64.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef _OE_MUSL_PATCHES_PTHREAD_H
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/musl/patches/syscall_arch.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef _OE_MUSL_PATCHES_SYSCALL_ARCH_H
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/musl/update.make
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f

# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

# MUSL C library definitions
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/optee/libutee/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

add_library(oeuteeasm
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/optee/libutee/compiler.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#ifndef COMPILER_H
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/optee/libutee/entry.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.

#include <compiler.h>
Expand Down
2 changes: 1 addition & 1 deletion CMakeGraphVizOptions.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.
#
# List of regular expressions matching targets to be excluded from the
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.
#
# Top-level CMake file for the Open Enclave SDK
Expand Down
2 changes: 1 addition & 1 deletion CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Open Enclave SDK contributors.
// Licensed under the MIT License.
//
// This file illustrates CMake settings to use for building and testing
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) Microsoft Corporation. All rights reserved.
Copyright (c) Open Enclave SDK contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion cmake/add_dcap_client_target.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Open Enclave SDK contributors.
# Licensed under the MIT License.

## This function adds a CMake target for the DCAP client and its dependencies provided through nuget
Expand Down
Loading

0 comments on commit 02428b8

Please sign in to comment.