fix loading of payload in updateSslCrt/setSslCrt

The presence of '\r' followed by '\n' seems to block loading the payload.
Further reading:
haproxy/haproxy@d60c893
opnsense/plugins#4560

Author: fraenki

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 * New API command: setSslCrt
 
+### Fixed
+* Fix loading of payload in updateSslCrt/setSslCrt
+
 ### Deprecated
 * Deprecate API command: updateSslCrt
 

haproxy/cmds.py

@@ -261,14 +261,14 @@ class newSslCrt(Cmd):
 
 class setSslCrt(Cmd):
     """" Begin a transaction to upload the certificate into a slot in HAProxy’s memory """
-    cmdTxt = "set ssl cert %(certfile)s <<\n%(payload)s\r\n"
+    cmdTxt = "set ssl cert %(certfile)s <<\n%(payload)s\n"
     req_args = ['certfile', 'payload']
     helpTxt = "Replace a certificate file."
 
 
 class updateSslCrt(Cmd):
     """" DEPRECATED. Begin a transaction to upload the certificate into a slot in HAProxy’s memory """
-    cmdTxt = "set ssl cert %(certfile)s <<\n%(payload)s\r\n"
+    cmdTxt = "set ssl cert %(certfile)s <<\n%(payload)s\n"
     req_args = ['certfile', 'payload']
     helpTxt = "DEPRECATED. Alias for setSslCrt. Kept for compatibility reasons."