revert logic to disable

Author: Jason2866

Diff for: libraries/Update/src/Update.h

@@ -63,7 +63,7 @@ class UpdateClass {
     */
   bool begin(size_t size = UPDATE_SIZE_UNKNOWN, int command = U_FLASH, int ledPin = -1, uint8_t ledOn = LOW, const char *label = NULL);
 
-#ifdef UPDATE_CRYPT
+#ifndef UPDATE_NOCRYPT
   /*
      Setup decryption configuration
      Crypt Key is 32bytes(256bits) block of data, use the same key as used to encrypt image file
@@ -72,7 +72,7 @@ class UpdateClass {
      Crypt Mode,    used to select if image files should be decrypted or not
     */
   bool setupCrypt(const uint8_t *cryptKey = 0, size_t cryptAddress = 0, uint8_t cryptConfig = 0xf, int cryptMode = U_AES_DECRYPT_AUTO);
-#endif /* UPDATE_CRYPT */
+#endif /* UPDATE_NOCRYPT */
 
   /*
       Writes a buffer to the flash and increments the address
@@ -101,7 +101,7 @@ class UpdateClass {
     */
   bool end(bool evenIfRemaining = false);
 
-#ifdef UPDATE_CRYPT
+#ifndef UPDATE_NOCRYPT
   /*
       sets AES256 key(32 bytes) used for decrypting image file
     */
@@ -125,7 +125,7 @@ class UpdateClass {
   void setCryptConfig(const uint8_t cryptConfig) {
     _cryptCfg = cryptConfig & 0x0f;
   }
-#endif /* UPDATE_CRYPT */
+#endif /* UPDATE_NOCRYPT */
 
   /*
       Aborts the running update
@@ -144,9 +144,9 @@ class UpdateClass {
       If calc_post_decryption is true, the update library will calculate the MD5 after the decryption, if false the calculation occurs before the decryption
     */
   bool setMD5(const char *expected_md5
-#ifdef UPDATE_CRYPT
+#ifndef UPDATE_NOCRYPT
 , bool calc_post_decryption = true
-#endif /* #ifdef UPDATE_CRYPT */
+#endif /* #ifdef UPDATE_NOCRYPT */
 );
 
   /*
@@ -244,21 +244,21 @@ class UpdateClass {
 private:
   void _reset();
   void _abort(uint8_t err);
-#ifdef UPDATE_CRYPT
+#ifndef UPDATE_NOCRYPT
   void _cryptKeyTweak(size_t cryptAddress, uint8_t *tweaked_key);
   bool _decryptBuffer();
-#endif /* UPDATE_CRYPT */
+#endif /* UPDATE_NOCRYPT */
   bool _writeBuffer();
   bool _verifyHeader(uint8_t data);
   bool _verifyEnd();
   bool _enablePartition(const esp_partition_t *partition);
   bool _chkDataInBlock(const uint8_t *data, size_t len) const;  // check if block contains any data or is empty
 
   uint8_t _error;
-#ifdef UPDATE_CRYPT
+#ifndef UPDATE_NOCRYPT
   uint8_t *_cryptKey;
   uint8_t *_cryptBuffer;
-#endif /* UPDATE_CRYPT */
+#endif /* UPDATE_NOCRYPT */
   uint8_t *_buffer;
   uint8_t *_skipBuffer;
   size_t _bufferLen;
@@ -270,19 +270,19 @@ class UpdateClass {
   const esp_partition_t *_partition;
 
   String _target_md5;
-#ifdef UPDATE_CRYPT
+#ifndef UPDATE_NOCRYPT
   bool _target_md5_decrypted = true;
-#endif /* UPDATE_CRYPT */
+#endif /* UPDATE_NOCRYPT */
   MD5Builder _md5;
 
   int _ledPin;
   uint8_t _ledOn;
 
-#ifdef UPDATE_CRYPT
+#ifndef UPDATE_NOCRYPT
   uint8_t _cryptMode;
   size_t _cryptAddress;
   uint8_t _cryptCfg;
-#endif /* UPDATE_CRYPT */
+#endif /* UPDATE_NOCRYPT */
 };
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_UPDATE)