diff options
| author | Kenny Root <kroot@google.com> | 2015-11-05 20:20:27 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-11-05 20:20:27 +0000 |
| commit | 03bcf618b7ed811b305845461fbb5497dfe55ac3 (patch) | |
| tree | 24150183cfed2ad79eb2258cf525b4fc4544bd2d /src/decrepit | |
| parent | fdeb488e6332a17729db5a04236e48a46a019272 (diff) | |
| download | external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.zip external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.gz external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.bz2 | |
Revert "external/boringssl: sync with upstream."
This reverts commit fdeb488e6332a17729db5a04236e48a46a019272.
This breaks trusty since it doesn't have setjmp.h
Change-Id: I960e25aa0bb2eef1237743b1567f7cb7f6d40497
Diffstat (limited to 'src/decrepit')
| -rw-r--r-- | src/decrepit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/decrepit/des/cfb64ede.c | 6 | ||||
| -rw-r--r-- | src/decrepit/xts/xts.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/decrepit/CMakeLists.txt b/src/decrepit/CMakeLists.txt index 0773f9a..84e5252 100644 --- a/src/decrepit/CMakeLists.txt +++ b/src/decrepit/CMakeLists.txt @@ -15,5 +15,3 @@ add_library( $<TARGET_OBJECTS:rsa_decrepit> $<TARGET_OBJECTS:xts> ) - -target_link_libraries(decrepit crypto) diff --git a/src/decrepit/des/cfb64ede.c b/src/decrepit/des/cfb64ede.c index f7e81d4..680a75a 100644 --- a/src/decrepit/des/cfb64ede.c +++ b/src/decrepit/des/cfb64ede.c @@ -61,6 +61,12 @@ #include "../crypto/des/internal.h" +/* defined in des.c */ +void DES_decrypt3(uint32_t *data, const DES_key_schedule *ks1, + const DES_key_schedule *ks2, const DES_key_schedule *ks3); +void DES_encrypt3(uint32_t *data, const DES_key_schedule *ks1, + const DES_key_schedule *ks2, const DES_key_schedule *ks3); + /* The input and output encrypted as though 64bit cfb mode is being used. The * extra state information to record how much of the 64bit block we have used * is contained in *num; */ diff --git a/src/decrepit/xts/xts.c b/src/decrepit/xts/xts.c index 632e0f8..cf8ad39 100644 --- a/src/decrepit/xts/xts.c +++ b/src/decrepit/xts/xts.c @@ -52,8 +52,7 @@ #include <openssl/aes.h> #include <openssl/cipher.h> - -#include "../crypto/modes/internal.h" +#include <openssl/modes.h> #if defined(OPENSSL_X86_64) || defined(OPENSSL_X86) || defined(OPENSSL_AARCH64) |