Merge branch 'danimaribeiro:master3' into master3

faio · Mar 8, 2024 · ee87960 · ee87960
2 parents e5fd954 + d95a466
commit ee87960
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pytrustnfe/nfe/danfe.py b/pytrustnfe/nfe/danfe.py
@@ -7,6 +7,7 @@
 from io import BytesIO
 from textwrap import wrap
 import math
+from html import escape
 from decimal import Decimal
 
 from reportlab.lib import utils
@@ -1051,7 +1052,7 @@ def adicionais(self, oXML=None, tamanho_diminuir=0):
         observacoes = tagtext(oNode=el_infAdic, cTag="infCpl")
         if fisco:
             observacoes = fisco + " " + observacoes
-        P = Paragraph(observacoes, styles["Normal"])
+        P = Paragraph(escape(observacoes), styles["Normal"])
         w, h = P.wrap(128 * mm, 32 * mm)
         altura = (self.height - self.nlin - 5) * mm
         P.drawOn(self.canvas, (self.nLeft + 1) * mm, altura - h)

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,7 @@
 signxml==2.9.0 ; python_version < '3.7'
 signxml ; python_version >= '3.7'
 lxml >= 4.2.1
-cryptography >= 3.4.8
+cryptography >= 3.4.8, <= 23.2.0
 pyOpenSSL >= 22.1.0
 certifi >=  2018.1.18
 

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = "2.0.1"
+VERSION = "2.0.2"
 
 
 setup(
@@ -53,7 +53,7 @@
         'xmlsec >= 1.3.13',  # apt update;apt install libxmlsec1-dev pkg-config -y
         'lxml >= 4.2.1',
         'cryptography >= 3.4.8',
-        'pyOpenSSL >= 17.5.0',
+        'pyOpenSSL >= 17.5.0, <= 23.2.0',
         'certifi >=  2018.1.18',
         'urllib3',
         'Jinja2',