From 197b16a2d43a8eb2219660c724e3574a905db162 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 1 Oct 2017 16:40:23 +0200
Subject: [PATCH] Remove *aes128ctr*

---
 Sodium.xcodeproj/project.pbxproj           |  2 -
 Sodium/libsodium/crypto_stream_aes128ctr.h | 68 ----------------------
 Sodium/libsodium/sodium_lib.h              |  1 -
 3 files changed, 71 deletions(-)
 delete mode 100644 Sodium/libsodium/crypto_stream_aes128ctr.h

diff --git a/Sodium.xcodeproj/project.pbxproj b/Sodium.xcodeproj/project.pbxproj
index 22a43cdd..7a91972e 100644
--- a/Sodium.xcodeproj/project.pbxproj
+++ b/Sodium.xcodeproj/project.pbxproj
@@ -120,7 +120,6 @@
 		09A9440C1A4EB91F00C8A04F /* crypto_shorthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash.h; sourceTree = "<group>"; };
 		09A9440D1A4EB91F00C8A04F /* crypto_sign_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_ed25519.h; sourceTree = "<group>"; };
 		09A9440F1A4EB91F00C8A04F /* crypto_sign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign.h; sourceTree = "<group>"; };
-		09A944101A4EB91F00C8A04F /* crypto_stream_aes128ctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_aes128ctr.h; sourceTree = "<group>"; };
 		09A944111A4EB91F00C8A04F /* crypto_stream_chacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_chacha20.h; sourceTree = "<group>"; };
 		09A944121A4EB91F00C8A04F /* crypto_stream_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa20.h; sourceTree = "<group>"; };
 		09A944131A4EB91F00C8A04F /* crypto_stream_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa208.h; sourceTree = "<group>"; };
@@ -334,7 +333,6 @@
 				09A9440C1A4EB91F00C8A04F /* crypto_shorthash.h */,
 				09A9440D1A4EB91F00C8A04F /* crypto_sign_ed25519.h */,
 				09A9440F1A4EB91F00C8A04F /* crypto_sign.h */,
-				09A944101A4EB91F00C8A04F /* crypto_stream_aes128ctr.h */,
 				09A944111A4EB91F00C8A04F /* crypto_stream_chacha20.h */,
 				09A944121A4EB91F00C8A04F /* crypto_stream_salsa20.h */,
 				09A944131A4EB91F00C8A04F /* crypto_stream_salsa208.h */,
diff --git a/Sodium/libsodium/crypto_stream_aes128ctr.h b/Sodium/libsodium/crypto_stream_aes128ctr.h
deleted file mode 100644
index a65f1915..00000000
--- a/Sodium/libsodium/crypto_stream_aes128ctr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef crypto_stream_aes128ctr_H
-#define crypto_stream_aes128ctr_H
-
-/*
- *  WARNING: This is just a stream cipher. It is NOT authenticated encryption.
- *  While it provides some protection against eavesdropping, it does NOT
- *  provide any security against active attacks.
- *  Unless you know what you're doing, what you are looking for is probably
- *  the crypto_box functions.
- */
-
-#include <stddef.h>
-#include "export.h"
-
-#ifdef __cplusplus
-# ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wlong-long"
-# endif
-extern "C" {
-#endif
-
-#define crypto_stream_aes128ctr_KEYBYTES 16U
-SODIUM_EXPORT
-size_t crypto_stream_aes128ctr_keybytes(void);
-
-#define crypto_stream_aes128ctr_NONCEBYTES 16U
-SODIUM_EXPORT
-size_t crypto_stream_aes128ctr_noncebytes(void);
-
-#define crypto_stream_aes128ctr_BEFORENMBYTES 1408U
-SODIUM_EXPORT
-size_t crypto_stream_aes128ctr_beforenmbytes(void);
-
-#define crypto_stream_aes128ctr_SIZE_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 16ULL * (1ULL << 32))
-
-SODIUM_EXPORT
-int crypto_stream_aes128ctr(unsigned char *out, unsigned long long outlen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((deprecated));
-
-SODIUM_EXPORT
-int crypto_stream_aes128ctr_xor(unsigned char *out, const unsigned char *in,
-                                unsigned long long inlen, const unsigned char *n,
-                                const unsigned char *k)
-            __attribute__ ((deprecated));
-
-SODIUM_EXPORT
-int crypto_stream_aes128ctr_beforenm(unsigned char *c, const unsigned char *k)
-            __attribute__ ((deprecated));
-
-SODIUM_EXPORT
-int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
-                                    const unsigned char *nonce, const unsigned char *c)
-            __attribute__ ((deprecated));
-
-SODIUM_EXPORT
-int crypto_stream_aes128ctr_xor_afternm(unsigned char *out, const unsigned char *in,
-                                        unsigned long long len,
-                                        const unsigned char *nonce,
-                                        const unsigned char *c)
-            __attribute__ ((deprecated));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Sodium/libsodium/sodium_lib.h b/Sodium/libsodium/sodium_lib.h
index 4b63bc90..ee2794c3 100644
--- a/Sodium/libsodium/sodium_lib.h
+++ b/Sodium/libsodium/sodium_lib.h
@@ -60,7 +60,6 @@
 # include "crypto_box_curve25519xchacha20poly1305.h"
 # include "crypto_secretbox_xchacha20poly1305.h"
 # include "crypto_pwhash_scryptsalsa208sha256.h"
-# include "crypto_stream_aes128ctr.h"
 # include "crypto_stream_salsa2012.h"
 # include "crypto_stream_salsa208.h"
 # include "crypto_stream_xchacha20.h"