Commit Graph

34 Commits

Author SHA1 Message Date
Tommy Lillehagen
fdf29f3c58 Update docker container and JDK make file
* Add missing build dependencies to `docker-minimal`
 * Build JDK without ALSA, CUPS, FreeType, Pulse and X11
2017-10-17 14:02:34 +01:00
Chris Rankin
04a801e0cd Squashed commit of the following: (#50)
commit 9d8046e310efe860bb9d81e977a323f3905665c1
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date:   Sat Sep 16 11:26:45 2017 -0500

    Check and handle signal interrupts in sockets

    Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>

commit 960ad91a4a8ec06020273a175471def37870fda6
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date:   Sat Sep 16 11:27:35 2017 -0500

    Add error code in oal for invalid inputs

    Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>

commit e22c569335c1ec8d18f7df8105a68e9b9a82e691
Author: Li, Xun <xun.li@intel.com>
Date:   Wed Sep 20 10:51:18 2017 +0800

    Update libunwind for glibc 2.26 compatibility

    libunwind should include <signal.h> explicitly.
    glibc change sys/ucontext.h as a bug fix(https://sourceware.org/git/?p=glibc.git;a=commit;h=cfed8ece799b6e6540193a14b41d9de52dc3b08f)

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 9cda5c4774b2f4fc02fd031f98057cd88d14f2e0
Merge: 94c162c98 36918f071
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Wed Sep 20 09:58:29 2017 +0800

    Merge pull request #165 from corda/chrisr3-stack-protector-fix

    Ensure trts_nsp.cpp is compiled without stack protection.

    Signed-off-by: Zhang Lili lili.z.zhang@intel.com

commit 36918f071fd29c86335b0cea0e072c3f08a51eae
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Tue Sep 19 07:31:57 2017 +0000

    Ensure trts_nsp.cpp is compiled without stack protection.

    Signed-off-by: Chris Rankin <chris.rankin@r3.com>

commit 94c162c98bf95a034eadb41bfa6e6a35f410a0c8
Author: Kai Mast <kaimast@cs.cornell.edu>
Date:   Mon Sep 18 04:07:19 2017 -0400

    g++7 fixes (#148)

    Signed-off-by: Li, Xun<xun.li@intel.com>

commit 8a72fed8737dc8e331889e6530925fc5a0be2ea0
Merge: 2133df2d4 635e3a370
Author: Li Xun <xun.li@intel.com>
Date:   Mon Sep 18 15:58:10 2017 +0800

    Merge pull request #159 from corda/chrisr3-gcc7-fix

    Resolve GCC 7.1 warnings about deprecated throw(std::bad_alloc) in C++11.

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 635e3a37081ad3f773a0ff24c89f1e6094034d28
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Wed Sep 13 10:31:11 2017 +0100

    Resolve warnings about deprecated throw(std::bad_alloc) in C++11.
2017-09-26 10:22:55 +01:00
Chris Rankin
6bb9d0015a Refresh linux-sgx to v1.9+ from upstream. (#42)
commit 2133df2d4ad82119333a003c8f05156998550615
Merge: 0356eb624 f2cf6d18a
Author: yuyuany <yuan.yu@intel.com>
Date:   Wed Sep 13 10:06:33 2017 +0800

    Merge pull request #155 from 01org/revert-151-ocall_exit_enclave

    Revert "Check for crash in sgx_ocall and exit enclave if enclave is crashed"

commit f2cf6d18aa73fdaa916f95b1f3c5ac605a90ff06
Author: yuyuany <yuan.yu@intel.com>
Date:   Thu Sep 7 15:21:45 2017 +0800

    Revert "Check for crash in sgx_ocall and exit enclave if enclave is crashed"

commit 0356eb6249ed93510ca66f057a5ae74dda7b10a2
Merge: 2fe247145 38023b61a
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Wed Sep 6 15:58:16 2017 +0800

    Merge pull request #153 from greglaun/greglaun-typos

    Correct typos in some of the sample apps.

    Signed-off-by: Zhang Lili lili.z.zhang@intel.com

commit 2fe247145943827f04eea8e065a8ad3b0a3d11bd
Merge: df9b03289 2e00f11ed
Author: Li Xun <xun.li@intel.com>
Date:   Wed Sep 6 14:10:42 2017 +0800

    Merge pull request #154 from llly/pull

    Fix build issues with latest OpenSSL and Gcc

commit 2e00f11ed5a2e48445aeabd668105161a55a4502
Author: Vytautas Mickus <vmickus@gmx.com>
Date:   Sat Jul 15 21:00:57 2017 +0300

    Make code compatible with OpenSSL 1.0 and 1.1

commit 95ea2c21a921ceb3851b090f092709c5b08b9b37
Author: Vytautas Mickus <vmickus@gmx.com>
Date:   Sat Jul 15 21:12:03 2017 +0300

    Tell gcc about the fallthroughs (needed because of -Werror in makefiles)

commit 6e0580d110d4c799e0c8aba0cdadee46efe15055
Author: Vytautas Mickus <vmickus@gmx.com>
Date:   Sat Jul 15 21:22:55 2017 +0300

    Use `uname -m` instead of `arch` in installer.

commit 38023b61aaa8f76fbad4391ecafd1342d9a2b4f0
Author: Greg Laun <greg.laun@gmail.com>
Date:   Tue Sep 5 12:33:37 2017 -0700

    Correct typos in some of the sample apps.

    Signed-off-by: Greg Laun <greg.laun@gmail.com>

commit df9b0328986784b603ce0b5af847d15382c795cb
Merge: a2f33d828 a20449f5f
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Tue Sep 5 10:41:22 2017 +0800

    Merge pull request #151 from yuyuany/ocall_exit_enclave

    Check for crash in sgx_ocall and exit enclave if enclave is crashed.

    Signed-off-by: Zhang Lili lili.z.zhang@intel.com

commit a20449f5f85acd4e482c35dd6f8f27f36a3caa60
Author: Yu Yuan <yuan.yu@intel.com>
Date:   Fri Sep 1 22:46:27 2017 +0800

    tRTS check the enclave crash state when doing an OCALL. If the enclave is crashed, tRTS unwind the stack to ECALL, and exit the enclave with SGX_ERROR_ENCLAVE_CRASHED.

    Signed-off-by: Yu Yuan <yuan.yu@intel.com>

commit a2f33d828bc76b49256e9a3128254e3322ef5d52
Merge: aa8e9755a 6979d8180
Author: Andy Zhao <yebin.andy.zhao@intel.com>
Date:   Mon Aug 28 16:30:00 2017 +0800

    Merge pull request #149 from lzha101/add_missing_delete

    Add two missing delete functions

commit 6979d818077c310ec4e75a56937b5aa87b718dae
Author: Zhang Lili <lili.z.zhang@intel.com>
Date:   Mon Aug 28 23:17:47 2017 +0800

    Add two missing delete functions.

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit aa8e9755aaecc4c04ed3f3993a1596adb4ba6286
Author: Dionna Glaze <dionnaglaze@google.com>
Date:   Wed Aug 2 10:48:18 2017 -0700

    Move pms pointer validation before its dereference in local_vars definitions.

    Also fix "sgx_status_t" typo in generated comment.

commit 6f0e20cfd992c073aefe76926d28893c51f52445
Author: John Mechalas <john.p.mechalas@intel.com>
Date:   Thu Aug 10 19:00:34 2017 -0700

    Implements most of libsgx_capable for Linux (previously only available in the Windows SDK) (#107)

    * Adds libsgx_capable, which is currently only available in the Windows
    version of the Intel SGX SDK. The Linux implementation of this library
    adds the following functions:

      sgx_status_t sgx_is_capable (int *sgx_capable);
      sgx_status_t sgx_cap_get_status (sgx_device_status_t *sgx_device_status);
      sgx_status_t sgx_cap_enable_device (sgx_device_status_t *sgx_device_status);

    And adds the following error code (also from the Windows version of the
    Intel SGX SDK):

      SGX_ERROR_NO_PRIVILEGE

    Generates both a static and dynamic build of libsgx_capable. This is
    incorporated into the SDK package, not the PSW package, since software
    installers need to check for Intel SGX capability on systems where the PSW
    may not already be installed. This means that installers will either have
    to statically link, or distribute the .so with their installation package.

    ----------------------

    Developer Certificate of Origin
    Version 1.1

    Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
    660 York Street, Suite 102,
    San Francisco, CA 94110 USA

    Everyone is permitted to copy and distribute verbatim copies of this
    license document, but changing it is not allowed.

    Developer's Certificate of Origin 1.1

    By making a contribution to this project, I certify that:

    (a) The contribution was created in whole or in part by me and I
        have the right to submit it under the open source license
        indicated in the file; or

    (b) The contribution is based upon previous work that, to the best
        of my knowledge, is covered under an appropriate open source
        license and I have the right under that license to submit that
        work with modifications, whether created in whole or in part
        by me, under the same open source license (unless I am
        permitted to submit under a different license), as indicated
        in the file; or

    (c) The contribution was provided directly to me by some other
        person who certified (a), (b) or (c) and I have not modified
        it.

    (d) I understand and agree that this project and the contribution
        are public and that a record of the contribution (including all
        personal information I submit with it, including my sign-off) is
        maintained indefinitely and may be redistributed consistent with
        this project or the open source license(s) involved.

    Signed-off-by: John P Mechalas <john.p.mechalas@intel.com>

commit 268b206f15f25671382b95c5650422b335d5c446
Merge: 803250734 136610236
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Fri Jul 28 12:38:05 2017 +0800

    Merge pull request #129 from dingelish/master

    Fix a mis-understood memory alignment in enclave_create().

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit 1366102364ce67f8c63eaba9bdae80c08634f07f
Author: Yu Ding <dingyu02@baidu.com>
Date:   Mon Jul 24 20:00:04 2017 -0700

    Fix to a mis-understood in enclave_create(). The memory alignment is mistakenly done twice. Once in urts and once in driver. It is unnecessary. This bug has a great impact on the upper limit of enclave memory.

commit 803250734883037a4a1f69085fb31daa6bd8448b
Author: Li Xun <xun.li@intel.com>
Date:   Tue Jul 25 10:44:47 2017 +0800

    Update server port to 80 (#128)

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit d42cd14bdd01a43c58554a4c73231733426356cd
Author: Jaak Randmets <jaak.ra+github@gmail.com>
Date:   Mon Jul 24 09:04:03 2017 +0300

    Merge pull request #124 from Jaak/master

    Improve const correctness of sgx_fopen and sgx_fimport_auto_key.

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit 8383b8c65f49fca017c62eb7efdd97a212829caf
Merge: 0fb9f47e7 768c95174
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Tue Jul 4 09:39:53 2017 +0800

    Merge pull request #120 from aminueza/master

    Fixes sdk and psw version in download_prebuild.sh script

    Zhang Lili <lili.z.zhang@intel.com>

commit 768c95174150e64207b31f5a733bccba25085775
Author: Amanda Souza <amandasouza@quimera.lsd.ufcg.edu.br>
Date:   Mon Jul 3 15:22:45 2017 -0300

    Fixes sdk and psw version in download_prebuild.sh script

    Signed-off-by: Amanda Souza <amandasouza@quimera.lsd.ufcg.edu.br>

commit 0fb9f47e784261369c52c1b49d1484f34409ecaf
Author: Li, Xun <xun.li@intel.com>
Date:   Fri Jun 30 15:51:16 2017 +0800

    Linux 1.9 Open Source Gold release

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 199911ebaf60d068e4641331a06e71462ba8d324
Merge: 109545891 a2abe4b0d
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Fri Jun 16 12:42:58 2017 +0800

    Merge pull request #115 from danzsmith53/master

    Update README.md

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit a2abe4b0d0490112fff7eb9669adf9d0bc866c54
Author: Daniel Smith <daniel.e.smith@intel.com>
Date:   Wed May 31 16:21:21 2017 -0700

    Update README.md

    Updated grammar and style many places throughout file

    Signed-off-by: Daniel Smith <daniel.e.smith@intel.com>

commit 1095458916fafd9e5870403e1d50cd7e1ca379bc
Merge: a4bfecb96 d6acac1d2
Author: Li Xun <xun.li@intel.com>
Date:   Mon Jun 12 09:26:58 2017 +0800

    Merge pull request #113 from mitar/patch-3

    pkg-config is needed for compilation

commit a4bfecb965a7588dc073a295dd842c301bbf075c
Merge: 02b7d490a 6a7ec7a8c
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Thu Jun 8 13:10:03 2017 +0800

    Merge pull request #112 from mitar/patch-2

    Removing sudo

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit 6a7ec7a8c14ee2ee8f6977110dae9fe99137064d
Author: Mitar <mitar.github@tnode.com>
Date:   Sun Jun 4 14:18:07 2017 -0700

    Removing sudo.

    The whole script has to be run as root anyway.

    Signed-off-by: Mi Tar <mitar.github@tnode.com>

commit d6acac1d25e67516dc6cb8d1dc7b155416078bb1
Author: Mitar <mitar.github@tnode.com>
Date:   Sun Jun 4 16:47:43 2017 -0700

    pkg-config is needed for compilation.

    See: https://github.com/01org/dynamic-application-loader-host-interface/issues/2#issuecomment-306074645

    Signed-off-by: Mi Tar <mitar.github@tnode.com>

commit 02b7d490aca40af134166221c9b4f332f6ca947a
Author: Li, Xun <xun.li@intel.com>
Date:   Tue May 16 08:40:33 2017 +0800

    fix a aesm_service IPC bug

    aesm_service handles closed client socket incorrectly found in #101

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit f287674fef604f4a6ef8710033f6a091fe644d7a
Merge: ce0f128d2 e7f074381
Author: Li Xun <xun.li@intel.com>
Date:   Fri May 12 16:10:42 2017 +0800

    Merge pull request #91 from sean-jc/docker/merge

    Add support for running the AESM and SGX applications in Docker

commit e7f0743812b065750135220a37d890988633cc64
Author: Sean Christopherson <sean.j.christopherson@intel.com>
Date:   Thu Mar 30 09:26:47 2017 -0700

    Add --no-daemon option to AESM

    Application container runtimes, e.g. Docker and RKT, do not provide a
    program manager, e.g. systemd, inside the container, and so attempting
    to run AESM as a daemon will fail.   Add --no-daemon to allow running
    the AESM in a container as a normal process, i.e. do not call daemon().

    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>

commit ce0f128d290e116748a78899673709730ac45964
Author: Li, Xun <xun.li@intel.com>
Date:   Mon May 8 09:01:52 2017 +0800

    fix aesm_service compilation with latest openssl

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit fd91609f543ae08991d76d94d28c4ec300bcbc84
Merge: 9e0c32ee5 75336444e
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Wed Apr 19 13:41:12 2017 +0800

    Merge pull request #96 from lzha101/master

    Fix alignment issue for metadata section

    Signed-off-by: Zhang Lili  <lili.z.zhang@intel.com>

commit 75336444e867082159cd7c99bbe0eca57013c806
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Fri Apr 14 16:03:48 2017 +0800

    Update comment

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit d455716f9c00265976870d167ee2fae52f354daf
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Fri Apr 14 15:45:41 2017 +0800

    Update ELF parser for metadata alignment

    Signed-off-by: Lili Zhang <lili.z.zhang@intel.com>

commit 2224616cb4675c0225a3e1080059f3360e69f800
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Fri Apr 14 15:43:05 2017 +0800

    Change alignment for metadata section

    Signed-off-by: Lili Zhang <lili.z.zhang@intel.com>

commit 9e0c32ee57f7dbd343cc1d75303e308b58b1fe93
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Thu Apr 13 10:33:35 2017 +0800

    Fix typo flase -> false in urts_internal.cpp

    Fix typo flase -> false in urts_internal.cpp

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit 765af6169d80beada705086ec9d5226bbdd96218
Merge: 0cbb1f074 38b3d5f46
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Thu Apr 13 10:30:06 2017 +0800

    Merge pull request #94 from neo9ree/master

    fixed typo flase -> false in psw/urts/linux/urts.cpp:45

    Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

commit 0cbb1f074d4b805a0492f6a000c5ddd1fda9efd7
Author: Li, Xun <xun.li@intel.com>
Date:   Mon Apr 10 14:24:45 2017 +0800

    Update Linux_SGXEclipsePlugin

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 38b3d5f4635c617d8181f3b8c1c6aa109a81dc21
Author: Eunchan Kim <eunchan.kim@kaist.ac.kr>
Date:   Thu Apr 6 15:31:02 2017 +0900

    fixed typo flase -> false in psw/urts/linux/urts.cpp:45

    Signed-off-by: Eunchan Kim <eunchan.kim@kaist.ac.kr>

commit 56783b38820f82dcb37f1f48c37a5f705ddf7358
Merge: e5c01189d 885287c13
Author: Li Xun <xun.li@intel.com>
Date:   Wed Apr 5 12:29:14 2017 +0800

    Merge pull request #92 from dcmiddle/fix-readme-pse-install

    fix readme section for PSW install

commit 885287c13df2519ca0318bd908b3827d6e247e17
Author: Dan Middleton <dan.middleton@intel.com>
Date:   Fri Mar 31 22:16:38 2017 -0500

    fix readme section for PSW install

    add missing cmake prerequisite to ubuntu instructions
    correct typos on systemctl

    Signed-off-by: Dan Middleton <dan.middleton@intel.com>

commit 65965c6ab61d103028b8b6a886b57e98ccf7ea9d
Author: Sean Christopherson <sean.j.christopherson@intel.com>
Date:   Tue Feb 7 12:51:44 2017 -0800

    Bind the AESM socket to /var/run/aesmd/aesm.socket

    Exposing sockets to Docker containers is typically done via bind
    mounts, which does not work for abstract sockets since they don't
    exist in the file system.

    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>

commit e5c01189d318e8c59f576377e231c159ffb71abb
Author: Li, Xun <xun.li@intel.com>
Date:   Thu Mar 30 13:45:20 2017 +0900

    update white list URL

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 072f4e40c0a5f6b7b27bf77f00872853933bd33a
Author: Li, Xun <xun.li@intel.com>
Date:   Fri Mar 24 11:20:35 2017 +0900

    add missing error code logging in aesm_service

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit c7a3f14de9dbda16fd0fa1edbce1af24b350a678
Author: Li, Xun <xun.li@intel.com>
Date:   Mon Mar 20 14:14:23 2017 +0900

    update instructions in README

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 525cefa817457d8a412d64677d347ebe64f0f77a
Merge: 1115c195c 157108515
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Fri Mar 17 11:32:05 2017 +0800

    Merge pull request #86 from lzha101/master

    Update README.md

    Signed-off-by: Lili Zhang <lili.z.zhang@intel.com>

commit 157108515551a5b465e7ba5e977df5c3e8df20b9
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Fri Mar 17 11:23:06 2017 +0800

    Update README.md

    Update README.md: fix format, update hardware requiremet, etc.

    Signed-off-by: Lili Zhang <lili.z.zhang@intel.com>

commit 1115c195cd60d5ab2b80c12d07e21663e5aa8030
Author: Li, Xun <xun.li@intel.com>
Date:   Thu Mar 16 15:30:38 2017 +0900

    Linux 1.8 Open Source Gold release

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 2e379dc79fb58cdf921e36d617e6e4b9d694301c
Merge: 0d8a7d248 24dc91d77
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Mon Feb 27 16:24:11 2017 +0800

    Merge pull request #65 from corda/fix-mallinfo

    Change mallinfo field type to int as per system malloc.h

    Signed-off-by: Lili Zhang <lili.z.zhang@intel.com>

commit 0d8a7d248a8ec6ae08451d78c7588711050d7477
Merge: 2cd3c7309 7e00ad320
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Thu Feb 23 16:30:28 2017 +0800

    Merge pull request #75 from kaimast/master

    Fix simulator under GCC6

    Signed-off-by: Lili Zhang <lili.z.zhang@intel.com>

commit 2cd3c73094637b1fa11740b7b9f51254050a9382
Merge: ddec9f872 171c04e0a
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Thu Feb 23 16:30:04 2017 +0800

    Merge pull request #78 from mitar/patch-1

    Added missing dependencies

    Signed-off-by: Lili Zhang <lili.z.zhang@intel.com>

commit 171c04e0a2d079e75580018f891dd32562963cc4
Author: Mitar <mitar.github@tnode.com>
Date:   Wed Feb 22 17:56:41 2017 -0800

    Added missing dependencies.

    Signed-off-by: Mi Tar <mitar.github@tnode.com>

commit 7e00ad320f7dd2c6070d92bec5bf8f52af8d2af0
Author: Kai Mast <kaimast@cs.cornell.edu>
Date:   Sun Feb 19 20:42:49 2017 -0500

    Fix simulator under GCC6

commit ddec9f8725b597b7b656847b5c7cff1e25cb8018
Merge: dd537b756 75349459a
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Thu Feb 16 13:47:12 2017 +0800

    Merge pull request #71 from sean-jc/master

    Bug fix - mprotect may be called with wrong flags

    Signed-off-by:  lzha101 <lili.z.zhang@intel.com>

commit 75349459a935f2b1a5a794ee8c0a0f45f50c5c1e
Author: Sean Christopherson <sean.j.christopherson@intel.com>
Date:   Mon Feb 6 12:31:30 2017 -0800

    Bug fix - mprotect may be called with wrong flags

    Query si_flags instead of attributes when determining whether a layout
    entry should be readable/writable or not accessible.  The current code
    magically works because all layout entries that should be marked R/W
    will have a non-zero value for attributes since added pages are marked
    with either ADD_EXTEND_PAGE or ADD_EXTEND_PAGE.

    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>

commit dd537b7562e16a83a1adf863e9e2874d05e2a9f3
Merge: d89c9abfd 91d5e850d
Author: haitaohuang <haitao.huang@intel.com>
Date:   Tue Jan 31 07:55:26 2017 -0600

    Merge pull request #68 from haitaohuang/master

    Clarify versions of the IPP crypto primitives

commit 91d5e850d1fcd1f4ae289639670bd48c67b2c6e1
Author: haitao huang <haitao.huang@intel.com>
Date:   Mon Jan 30 17:17:59 2017 -0600

    Clarify versions of the IPP crypto primitives

    Added statement in README.txt to clarify differences in two versions IPP crypto used for build.

    Signed-off-by: haitao huang <haitao.huang@intel.com>
2017-09-13 14:52:21 +01:00
Chris Rankin
697e2a6352 Build javadocs for deterministic JVM. (#45) 2017-09-13 14:16:01 +01:00
Chris Rankin
35c2da7030 Squashed commit of the following: (#41)
commit 6603c2f5ab68db30f265073138e75e0ff4542b57
Merge: 0347a6da4 cc128aa4f
Author: Joel Dice <joel.dice@gmail.com>
Date:   Tue Sep 12 10:20:45 2017 -0600

    Merge pull request #550 from corda/chrisr3-exceptions-vmrun

    Refactor handling of uncaught exceptions with OpenJDK to use runRaw().

commit cc128aa4f93d4deadd3368fb68397c52ee88fe86
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Mon Sep 11 23:41:57 2017 +0100

    Refactor handling of uncaught exception with OpenJDK to use runRaw().
2017-09-13 10:09:17 +01:00
Chris Rankin
56c7c91fee Squashed commit of the following: (#39)
commit 0347a6da462f724011c4078e9551800fa6455c56
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon Sep 11 10:49:39 2017 -0600

    attempt to fix Travis-CI build regression linked to Trusty upgrade

commit 06cae8a63c9a9b986b75d25b87af5e5a7610e0e5
Merge: 0056f2885 e94b191e6
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon Sep 11 10:41:58 2017 -0600

    Merge pull request #548 from corda/chrisr3-log-uncaught-exceptions

    Allow any uncaught exception to be logged as the thread exits.

commit 0056f2885285de374464436a9d6a6cea3a0e3c1b
Merge: a25c09bb7 7b3bedf0a
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon Sep 11 10:39:57 2017 -0600

    Merge pull request #549 from seanhenry/fix-string-builder

    Changes return type to StringBuilder

commit 7b3bedf0a4d16d837ec97cdac10dd86aef82953e
Author: Sean Henry <hello@seanhenry.codes>
Date:   Sun Sep 10 09:00:09 2017 -0700

    Changes return type to StringBuilder

commit e94b191e6dd83d86775079fa3dff218f7fe53005
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Wed Sep 6 10:38:34 2017 +0100

    Allow any uncaught exception to be logged as the thread exits.
2017-09-11 22:41:06 +01:00
Chris Rankin
c0c75c3e19 Squashed commit of the following: (#32)
commit a25c09bb738e7e82d2dfd909381ba052f7b69687
Merge: aa6664214 92af5d169
Author: Joel Dice <joel.dice@gmail.com>
Date:   Tue Sep 5 11:38:08 2017 -0600

    Merge pull request #545 from corda/chrisr3-uncaught-exceptions

    Support Thread.uncaughtExceptionHandler with OpenJDK

commit aa666421499d0e9ed46b6c745a93abd9998a58b0
Merge: dc8c99bd2 1cb11e964
Author: Joel Dice <joel.dice@gmail.com>
Date:   Tue Sep 5 11:23:41 2017 -0600

    Merge pull request #546 from corda/chrisr3-werror

    Fix "fallthrough" warnings with recent GCC.

commit dc8c99bd2f045c787f2c322cd65f866626fa9461
Author: Joel Dice <joel.dice@gmail.com>
Date:   Tue Sep 5 11:17:54 2017 -0600

    fix bootimage-test build regression

commit 1cb11e964fab925e9d98373ba58e181b1a1f11fd
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Tue Sep 5 10:25:48 2017 +0100

    Fix "fallthrough" warnings with recent GCC.

commit 92af5d169dbfb7b9b9f5b667b0dc71ca7b98b416
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Mon Sep 4 17:26:31 2017 +0100

    Ensure that the thread resources are only cleaned up once.

commit 05d260f8bed68e3f999619aee338a781ba0f4c63
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Mon Sep 4 17:10:04 2017 +0100

    Test exception thrown from uncaught-exception handler.

commit b1c5dca36163a876fba86221493883ddbd5fe805
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Tue Aug 29 17:17:24 2017 +0100

    Support Thread.uncaughtExceptionHandler.
2017-09-06 10:48:26 +01:00
Chris Rankin
674050779e Squashed commit of the following: (#29)
commit 5575c69eb456ccf7c3cfa41c20a45c8c70ce7656
Merge: 679e5af0e 7650b9c6f
Author: Joel Dice <joel.dice@gmail.com>
Date:   Tue Aug 22 07:46:44 2017 -0600

    Merge pull request #541 from corda/class-resolver-crash

    Fix crash when resolving system classes.

commit 679e5af0ef5d73a467845513d51d0fa0f7fa46b0
Merge: 01bef8ed6 6535959bd
Author: Joel Dice <joel.dice@gmail.com>
Date:   Tue Aug 22 07:36:22 2017 -0600

    Merge pull request #542 from corda/remove-unused-getVMClass

    Refactor partially implemented getVMClass(Object) function.

commit 01bef8ed6f92e0b047a12a46f9286aca82c4fdb9
Merge: fabf4dd0c 2fb3b0d17
Author: Joel Dice <joel.dice@gmail.com>
Date:   Wed Aug 2 16:48:52 2017 -0600

    Merge pull request #544 from teras/master

    Update to latest active iOS platform

commit 2fb3b0d179228a370875df7711a6b58c492f4de4
Author: Panayotis Katsaloulis <panayotis@panayotis.com>
Date:   Wed Aug 2 21:14:26 2017 +0300

    Update to latest active iOS platform

commit 6535959bd8f85b9351c823c6c4a1d364905a8824
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Fri Jul 28 09:58:42 2017 +0100

    Remove unimplemented function Classes.getVMClass(Object).
    This function seems to have been migrated to Object already anyway,
    so refactor its one remaining use accordingly.

commit 7650b9c6fe21e02380a17620f192c9bbcec02092
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Thu Jul 27 15:06:18 2017 +0100

    Fix crash when resolving system classes.
2017-08-30 11:03:22 +01:00
Chris Rankin
3ae53683ea Register Kryo serializer for use inside the SGX enclave. (#23) 2017-08-15 12:05:32 +01:00
Chris Rankin
aa82c55c87 Recreate linux-sgx-driver as a subtree rather than a submodule. (#21)
* Remove linux-sgx-driver as a submodule.
* Squashed 'sgx-jvm/linux-sgx-driver/' content from commit cd516380e

git-subtree-dir: sgx-jvm/linux-sgx-driver
git-subtree-split: cd516380e5ffa008505dc0e86ddbf45276021219
2017-08-15 12:05:32 +01:00
Chris Rankin
2cfadd8b95 Ensure JNI header file is generated for a clean build. (#18) 2017-08-15 12:05:32 +01:00
Andras Slemmer
260ebf962b sgx: More fiddling 2017-08-01 16:49:44 +02:00
Andras Slemmer
01e71c39e6 sgx: Change HSM prod IP 2017-08-01 16:49:44 +02:00
Andras Slemmer
91dafbe870 sgx: Add udev rule for cardreader 2017-08-01 16:49:44 +02:00
Andras Slemmer
11cdae32d6 sgx: prod scripts 2017-08-01 16:49:44 +02:00
Andras Slemmer
21087cbe91 sgx: add driver submodule 2017-08-01 16:49:44 +02:00
Andras Slemmer
6320990877 sgx: prepare for building in docker image on prod 2017-08-01 16:49:44 +02:00
Chris Rankin
4b3a804990 Build SGX against deterministic fork of OpenJDK8 (#16)
* Update SGX build to use deterministic OpenJDK repository.
* Remove unused imports.
* Update Kotlin dependencies.
* Update Avian so that it compiles against our OpenJDK repo.
Also include sunec.jar in the Avian binary. because the Enclavlet needs it.
* Embed jsse.jar within Avian to enable X.509 support.
2017-07-19 13:29:47 +01:00
Chris Rankin
9411c223af Squashed commit of the following: (#15)
commit fabf4dd0cca19118c59c925f572a655d1d9c4092
Author: Joel Dice <joel.dice@gmail.com>
Date:   Sun Jul 9 17:36:06 2017 -0600

    reserve a little more stack space for worst-case lambda expressions

commit 24b95016dd6f62fa4a82312310fcb5c55cc22f93
Author: Joel Dice <joel.dice@gmail.com>
Date:   Sun Jul 9 17:33:39 2017 -0600

    support constructor references

commit a329416f4f37840d2a5d7976874585413cd4c6af
Author: Joel Dice <joel.dice@gmail.com>
Date:   Sun Jul 9 17:11:19 2017 -0600

    normalize class name in Classes.forName

    This fixes a Tomcat classloading issue when using the OpenJDK class library.

commit ecafdf40baf2f3cde4835620e9af4380b1081fe7
Author: Joel Dice <joel.dice@gmail.com>
Date:   Sun Jul 9 16:58:04 2017 -0600

    fix some lambda bugs

commit 552dfd779baf077cc6445b4042588e4b6e34f3d2
Merge: 63dda56 aa2f25d
Author: Joel Dice <joel.dice@gmail.com>
Date:   Sat Jul 8 10:57:59 2017 -0600

    Merge remote-tracking branch 'corda/chrisr3-invoking-extension'

commit 63dda560f8648a793bdb609879076ab729b17e19
Merge: 3ec983d e589f10
Author: Joel Dice <joel.dice@gmail.com>
Date:   Sat Jul 8 10:54:53 2017 -0600

    Merge pull request #538 from dicej/master

    avoid definePackage infinite recursion with OpenJDK class library

commit aa2f25da404b2fc168a672392df939b52ea250ab
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Mon Jul 3 17:26:41 2017 +0100

    Add support for "invokevirtual" and "invokeinterface".
    The "invokeinterface" support seems to be broken for lambdas that require native types to be boxed/unboxed.

commit e589f105741ea36d07bba1e300c7ed69c33a22d1
Author: Joel Dice <joel.dice@gmail.com>
Date:   Sun Jul 2 19:43:36 2017 -0600

    avoid definePackage infinite recursion with OpenJDK class library

commit 3ec983dd82e01b36fb96411df345a54119a68181
Merge: 6f6bdd7 78881d4
Author: Joel Dice <joel.dice@gmail.com>
Date:   Tue Jun 13 09:50:49 2017 -0600

    Merge pull request #534 from lwahlmeier/fileGetParentFile

    fixed File.getParent when getting parent returns root

commit 78881d427cd474c14f5ce94484f5253de564074b
Author: Luke Wahlmeier <lwahlmeier@gmail.com>
Date:   Tue May 30 13:42:56 2017 -0600

    fixed File.getParent when getting parent returns root

commit 6f6bdd7d5c171e0c4c807d0a4f3aa676461307de
Merge: 8b694f9 b22343e
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon May 22 12:58:09 2017 -0600

    Merge pull request #529 from mikehearn/proguard-fixes

    Some fixes to the ProGuard files

commit 8b694f961496f2d47a377254f61153b0338335fd
Merge: dfae414 61c82e1
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon May 22 12:57:54 2017 -0600

    Merge pull request #531 from mikehearn/fileinputstream-compat

    FileInputStream has wrapped some more native methods

commit dfae414da8da57049076c16c43472cc32bdeb07c
Merge: 16dd804 d7a6f68
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon May 22 12:57:38 2017 -0600

    Merge pull request #532 from mikehearn/use-symlinks

    Symlink OpenJDK files rather than hardlink

commit d7a6f68235b2d42c03aba36f1bb48d173adb4fa6
Author: Mike Hearn <mike@plan99.net>
Date:   Sun May 14 21:42:06 2017 +0200

    Symlink OpenJDK files rather than hardlink

commit 61c82e1070d857bcdc7a4f086d13836d9608da00
Author: Mike Hearn <mike@plan99.net>
Date:   Sun May 14 21:40:52 2017 +0200

    FileInputStream has wrapped some more native methods in recent OpenJDK releases

commit b22343eb6731f1df2631635e2fcf9d51817273fe
Author: Mike Hearn <mike@plan99.net>
Date:   Sun May 14 21:38:09 2017 +0200

    Some fixes to the ProGuard files

commit 16dd804f392168497fa17ab682978f938e291bfb
Merge: e2d3270 19deadd
Author: Joel Dice <joel.dice@gmail.com>
Date:   Wed Mar 22 16:00:30 2017 -0600

    Merge pull request #526 from MaartenR/arrays-binsearch

    Added integer array binary search methods to Arrays class

commit e2d3270fe8e92203b6107b95f862ff5bd245c37a
Merge: dee99d6 545b9c8
Author: Joel Dice <joel.dice@gmail.com>
Date:   Wed Mar 22 16:00:20 2017 -0600

    Merge pull request #527 from MaartenR/integer-nolz

    Added numberOfLeadingZeros method to Integer class

commit 545b9c8732a6ea026285b1edf976a79eb541ef2e
Author: Maarten Raaphorst <mwraaphorst@gmail.com>
Date:   Tue Mar 14 11:23:36 2017 +0100

    Tested more negative numbers

commit b45bcf09535daef99ed31451ae55db8bec83164c
Author: Maarten Raaphorst <mwraaphorst@gmail.com>
Date:   Tue Mar 14 10:47:27 2017 +0100

    Added unit test for numberOfLeadingZeros method of the Integer class

commit 19deadd36bbfc02a8c13e6d91963e41f5125057f
Author: Maarten Raaphorst <mwraaphorst@gmail.com>
Date:   Mon Mar 13 12:19:17 2017 +0100

    Fixed mistake with end index being exclusive

commit 7271c0b7077ae3bef473e036aa0f0298a9eb0601
Author: Maarten Raaphorst <mwraaphorst@gmail.com>
Date:   Fri Mar 10 11:17:13 2017 +0100

    Added numberOfLeadingZeros method to Integer class

commit 023bb69acd071348f29cd43ff954d3dcf2856c7c
Author: Maarten Raaphorst <mwraaphorst@gmail.com>
Date:   Thu Mar 9 13:43:03 2017 +0100

    Added integer array binary search methods to Arrays class

commit dee99d6dd60b743a870d1a2c58183649c8a6449c
Merge: f7a651d 6c90953
Author: Joel Dice <joel.dice@gmail.com>
Date:   Wed Mar 1 08:39:32 2017 -0700

    Merge pull request #525 from MaartenR/master

    Added functionality to HttpURLConnection for obtaining content length

commit 6c90953745be5451ac9a028639f94e3fcc43d7f3
Author: Maarten Raaphorst <raaphorst@serviceplanet.nl>
Date:   Wed Mar 1 14:19:51 2017 +0100

    Made http headers case insensitive

commit 2c3a82d2b387251a8932ddb6575e718c2c1785a7
Author: Maarten Raaphorst <mwraaphorst@gmail.com>
Date:   Fri Feb 3 05:42:56 2017 -0800

    Added functionality to HttpURLConnection for obtaining content length
2017-07-10 17:01:56 +01:00
Andras Slemmer
7d337c8821 README.md: add sentence on unsigned SIGSTRUCT blob 2017-06-19 17:32:09 +01:00
Andras Slemmer
e8f4e303eb Fix GenerateSgxKey typo 2017-06-19 16:08:16 +01:00
Andras Slemmer
fe4827d932 Add .md line on HSM pubkey filename 2017-06-19 16:04:10 +01:00
Andras Slemmer
cdafa08604 sgx: Update dependencies 2017-06-15 18:41:58 +01:00
Andras Slemmer
f42e7d35c7 sgx: Add LD_LIBRARY_PATH for sign_helper 2017-06-15 18:12:08 +01:00
Andras Slemmer
5f2d6f8877 sgx: Remove section on key overwriting 2017-06-15 15:17:25 +01:00
Andras Slemmer
39942b9ce2 sgx: Fix hsm-tool CLI parsing, increase key generation timeout window, add IntelWhitelistFormInstructions.md 2017-06-15 15:11:46 +01:00
Andras Slemmer
c8c8c8eb66 sgx: Fix libprotobuf linking when SGX_USE_HARDWARE=TRUE, write pretty printed hsm sigstruct 2017-06-15 14:10:26 +01:00
Andras Slemmer
4e38d45a41 Address comments #2 2017-06-15 12:04:59 +01:00
Andras Slemmer
904252c0bb HSM works 2017-06-15 11:17:11 +01:00
Matthew Nesbit
294dc41fe6 Add a tool that connects to the HSM and creates signatures suitable for SGX enclave signing. 2017-06-15 11:17:11 +01:00
Andras Slemmer
3d8581a946 Add noop-enclave 2017-06-15 11:17:11 +01:00
Andras Slemmer
528c9efe9d Add sgx build, documentation, verify-enclave 2017-03-24 18:23:04 +00:00
Andras Slemmer
9bb3d6b972 Add 'sgx-jvm/avian/' from commit '09e4fe60d01f4f4bfb6b2976973bb4913ef61edc'
git-subtree-dir: sgx-jvm/avian
git-subtree-mainline: f978eab8d1
git-subtree-split: 09e4fe60d0
2017-03-13 12:18:24 +00:00
Andras Slemmer
f978eab8d1 Add 'sgx-jvm/linux-sgx/' from commit '2df43c54f3a215b2fe927995c7a8869054cccf8f'
git-subtree-dir: sgx-jvm/linux-sgx
git-subtree-mainline: d52accb52c
git-subtree-split: 2df43c54f3
2017-03-13 12:18:12 +00:00