Revert "external/boringssl: sync with upstream."

This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.

This breaks some x86 builds.

Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25

1 files changed, 6 insertions, 21 deletions

diff --git a/src/include/openssl/des.h b/src/include/openssl/des.h
index f9db62d..6e1b0cf 100644
--- a/src/include/openssl/des.h
+++ b/src/include/openssl/des.h
@@ -72,7 +72,12 @@ typedef struct DES_cblock_st {
 } DES_cblock;
 
 typedef struct DES_ks {
-  uint32_t subkeys[16][2];
+  union {
+    DES_cblock cblock;
+    /* make sure things are correct size on machines with
+     * 8 byte longs */
+    uint32_t deslong[2];
+  } ks[16];
 } DES_key_schedule;
 
 
@@ -137,26 +142,6 @@ OPENSSL_EXPORT void DES_ede2_cbc_encrypt(const uint8_t *in, uint8_t *out,
                                          DES_cblock *ivec, int enc);
 
 
-/* Deprecated functions. */
-
-/* DES_set_key_unchecked calls |DES_set_key|. */
-OPENSSL_EXPORT void DES_set_key_unchecked(const DES_cblock *key,
-                                          DES_key_schedule *schedule);
-
-OPENSSL_EXPORT void DES_ede3_cfb64_encrypt(const uint8_t *in, uint8_t *out,
-                                           long length, DES_key_schedule *ks1,
-                                           DES_key_schedule *ks2,
-                                           DES_key_schedule *ks3,
-                                           DES_cblock *ivec, int *num, int enc);
-
-OPENSSL_EXPORT void DES_ede3_cfb_encrypt(const uint8_t *in, uint8_t *out,
-                                         int numbits, long length,
-                                         DES_key_schedule *ks1,
-                                         DES_key_schedule *ks2,
-                                         DES_key_schedule *ks3,
-                                         DES_cblock *ivec, int enc);
-
-
 #if defined(__cplusplus)
 }  /* extern C */
 #endif