net-snmp 3.7.0 → 3.7.1

package/README.md

@@ -3203,6 +3203,10 @@ Example programs are included under the module's `example` directory.
 
  * Add SHA-2 authentication support (SHA-224, SHA-256, SHA-384, SHA-512)
 
+## Version 3.7.1 - 05/06/2022
+
+ * Fix DES decrypt corruption issue
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/index.js

@@ -879,7 +879,7 @@ var readPdu = function (reader, scoped) {
 	var contextEngineID;
 	var contextName;
 	if ( scoped ) {
-		reader.readSequence ();
+		reader = new ber.Reader (reader.readString (ber.Sequence | ber.Constructor, true));
 		contextEngineID = reader.readString (ber.OctetString, true);
 		contextName = reader.readString ();
 	}
@@ -1051,9 +1051,9 @@ Encryption.encryptPdu = function (privProtocol, scopedPdu, privPassword, authPro
 	return encryptFunction (scopedPdu, privProtocol, privPassword, authProtocol, engine);
 };
 
-Encryption.decryptPdu = function (privProtocol, encryptedPdu, privParameters, privPassword, authProtocol, engine, forceAutoPaddingDisable) {
+Encryption.decryptPdu = function (privProtocol, encryptedPdu, privParameters, privPassword, authProtocol, engine) {
 	var decryptFunction = Encryption.algorithms[privProtocol].decryptPdu;
-	return decryptFunction (encryptedPdu, privProtocol, privParameters, privPassword, authProtocol, engine, forceAutoPaddingDisable);
+	return decryptFunction (encryptedPdu, privProtocol, privParameters, privPassword, authProtocol, engine);
 };
 
 Encryption.debugEncrypt = function (encryptionKey, iv, plainPdu, encryptedPdu) {
@@ -1179,7 +1179,7 @@ Encryption.encryptPduDes = function (scopedPdu, privProtocol, privPassword, auth
 	};
 };
 
-Encryption.decryptPduDes = function (encryptedPdu, privProtocol, privParameters, privPassword, authProtocol, engine, forceAutoPaddingDisable) {
+Encryption.decryptPduDes = function (encryptedPdu, privProtocol, privParameters, privPassword, authProtocol, engine) {
 	var des = Encryption.algorithms[PrivProtocols.des];
 	var privLocalizedKey;
 	var decryptionKey;
@@ -1203,23 +1203,9 @@ Encryption.decryptPduDes = function (encryptedPdu, privProtocol, privParameters,
 	}
 	
 	decipher = crypto.createDecipheriv (des.CRYPTO_ALGORITHM, decryptionKey, iv);
-	if ( forceAutoPaddingDisable ) {
-		decipher.setAutoPadding(false);
-	}
+	decipher.setAutoPadding(false);
 	decryptedPdu = decipher.update (encryptedPdu);
-	// This try-catch is a workaround for a seemingly incorrect error condition
-	// - where sometimes a decrypt error is thrown with decipher.final()
-	// It replaces this line which should have been sufficient:
-	// decryptedPdu = Buffer.concat ([decryptedPdu, decipher.final()]);
-	try {
-		decryptedPdu = Buffer.concat ([decryptedPdu, decipher.final()]);
-	} catch (error) {
-		// debug("Decrypt error: " + error);
-		decipher = crypto.createDecipheriv (des.CRYPTO_ALGORITHM, decryptionKey, iv);
-		decipher.setAutoPadding(false);
-		decryptedPdu = decipher.update (encryptedPdu);
-		decryptedPdu = Buffer.concat ([decryptedPdu, decipher.final()]);
-	}
+	decryptedPdu = Buffer.concat ([decryptedPdu, decipher.final()]);
 	// Encryption.debugDecrypt (decryptionKey, iv, encryptedPdu, decryptedPdu);
 
 	return decryptedPdu;
@@ -1491,23 +1477,10 @@ Message.prototype.decryptPdu = function (user, responseCb) {
 		decryptedPduReader = new ber.Reader (decryptedPdu);
 		this.pdu = readPdu(decryptedPduReader, true);
 		return true;
-	// really really occasionally the decrypt truncates a single byte
-	// causing an ASN read failure in readPdu()
-	// in this case, disabling auto padding decrypts the PDU correctly
-	// this try-catch provides the workaround for this condition
-	} catch (possibleTruncationError) {
-		try {
-			decryptedPdu = Encryption.decryptPdu(user.privProtocol, this.encryptedPdu,
-					this.msgSecurityParameters.msgPrivacyParameters, user.privKey, user.authProtocol,
-					this.msgSecurityParameters.msgAuthoritativeEngineID, true);
-			decryptedPduReader = new ber.Reader (decryptedPdu);
-			this.pdu = readPdu(decryptedPduReader, true);
-			return true;
-		} catch (error) {
-			responseCb (new ResponseInvalidError ("Failed to decrypt PDU: " + error,
-					ResponseInvalidCode.ECouldNotDecrypt));
-			return false;
-		}
+	} catch (error) {
+		responseCb (new ResponseInvalidError ("Failed to decrypt PDU: " + error,
+				ResponseInvalidCode.ECouldNotDecrypt));
+		return false;
 	}
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "net-snmp",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "JavaScript implementation of the Simple Network Management Protocol (SNMP)",
   "main": "index.js",
   "directories": {