summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2017-02-04 13:50:43 +0100
committerIlya Etingof <etingof@gmail.com>2017-02-04 13:50:43 +0100
commite1d67e260122345fe80f91fbbfefcd2110b417c4 (patch)
treeab5546d58c942bee9eeb01d32bb9a7314683c3eb
parent48e0be3ce60efd4f27a2a388a34e28579df33b29 (diff)
downloadpysnmp-git-e1d67e260122345fe80f91fbbfefcd2110b417c4.tar.gz
pyasn1 SEQUENCE iteration rules change
-rw-r--r--CHANGES.txt7
-rw-r--r--pysnmp/proto/mpmod/rfc3412.py11
2 files changed, 11 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 7a794afa..2f7fff36 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,6 @@
-Revision 4.3.3, work in progress
---------------------------------
-
-Github `repo <https://github.com/etingof/pysnmp>`_
+Revision 4.3.3, released 04-02-2017
+-----------------------------------
- Switched from now unmaintained PyCrypto to PyCryptodome.
- Switched to new-style classes.
@@ -29,6 +27,7 @@ Github `repo <https://github.com/etingof/pysnmp>`_
- Updated IP address for demo.snmplabs.com in examples.
- Missing index added to bundled RFC1213::atEntry MIB table.
- Twisted intergation made Python3 compatible.
+- Accommodated ASN.1 SEQUENCE iteration rules change in upcoming pyasn1 version.
- Author's email changed, copyright extended to 2017
Revision 4.3.2, released 2016-02-12
diff --git a/pysnmp/proto/mpmod/rfc3412.py b/pysnmp/proto/mpmod/rfc3412.py
index 94b6d844..c9b6286a 100644
--- a/pysnmp/proto/mpmod/rfc3412.py
+++ b/pysnmp/proto/mpmod/rfc3412.py
@@ -1,7 +1,7 @@
#
# This file is part of pysnmp software.
#
-# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
+# Copyright (c) 2005-2016, Ilya Etingof <ilya@glas.net>
# License: http://pysnmp.sf.net/license.html
#
import sys
@@ -594,7 +594,9 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
# Sniff for engineIdCache
k = (transportDomain, transportAddress)
if k not in self.__engineIdCache:
- contextEngineId, contextName, pdus = scopedPDU
+ contextEngineId = scopedPDU[0]
+ contextName = scopedPDU[1]
+ pdus = scopedPDU[2]
pdu = pdus.getComponent()
# Here we assume that authentic/default EngineIDs
# come only in the course of engine-to-engine communication.
@@ -619,7 +621,10 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
snmpEngineID = snmpEngineID.syntax
# 7.2.7 XXX PDU would be parsed here?
- contextEngineId, contextName, pdu = scopedPDU
+ contextEngineId = scopedPDU[0]
+ contextName = scopedPDU[1]
+ pdu = scopedPDU[2]
+
pdu = pdu.getComponent() # PDUs
# 7.2.8