DeineAgenturUG/go-xmlsec
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move all invocations of CString to globals where the fact that it leaks memory doesn’t matter

Browse Source 
bug #5
This commit is contained in:
Ross Kinder
2015-12-23 15:08:05 -05:00
parent 064bef37e7
commit 67af552ad1
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
encrypt.go
View File

@@ -88,6 +88,20 @@ type EncryptOptions struct {
var errInvalidAlgorithm = errors.New("invalid algorithm") var errInvalidAlgorithm = errors.New("invalid algorithm")
// global string constants
// Note: the invocations of C.CString() here return a pointer to a string
// allocated from the C heap that would normally need to freed by calling
// C.free, but because these are global, we can just leak them.
var (
constDsigNamespace = (*C.xmlChar)(unsafe.Pointer(C.CString("http://www.w3.org/2000/09/xmldsig#")))
constDigestMethod = (*C.xmlChar)(unsafe.Pointer(C.CString("DigestMethod")))
constAlgorithm = (*C.xmlChar)(unsafe.Pointer(C.CString("Algorithm")))
constSha512 = (*C.xmlChar)(unsafe.Pointer(C.CString("http://www.w3.org/2001/04/xmlenc#sha512")))
constSha384 = (*C.xmlChar)(unsafe.Pointer(C.CString("http://www.w3.org/2001/04/xmldsig-more#sha384")))
constSha256 = (*C.xmlChar)(unsafe.Pointer(C.CString("http://www.w3.org/2001/04/xmlenc#sha256")))
constSha1 = (*C.xmlChar)(unsafe.Pointer(C.CString("http://www.w3.org/2000/09/xmldsig#sha1")))
)
// Encrypt encrypts the XML document to publicKey and returns the encrypted // Encrypt encrypts the XML document to publicKey and returns the encrypted
// document. // document.
func Encrypt(publicKey, doc []byte, opts EncryptOptions) ([]byte, error) { func Encrypt(publicKey, doc []byte, opts EncryptOptions) ([]byte, error) {
@@ -197,29 +211,27 @@ func Encrypt(publicKey, doc []byte, opts EncryptOptions) ([]byte, error) {
if keyInfoNode2 == nil { if keyInfoNode2 == nil {
return nil, mustPopError() return nil, mustPopError()
} }
// Add a DigestMethod element to the encryption method node // Add a DigestMethod element to the encryption method node
{ {
encKeyMethod := C.xmlSecTmplEncDataGetEncMethodNode(encKeyNode) encKeyMethod := C.xmlSecTmplEncDataGetEncMethodNode(encKeyNode)
var ns = constXMLChar("http://www.w3.org/2000/09/xmldsig#")
var strDigestMethod = constXMLChar("DigestMethod")
var strAlgorithm = constXMLChar("Algorithm")
var algorithm *C.xmlChar var algorithm *C.xmlChar
switch opts.DigestAlgorithm { switch opts.DigestAlgorithm {
case Sha512: case Sha512:
algorithm = constXMLChar("http://www.w3.org/2001/04/xmlenc#sha512") algorithm = constSha512
case Sha384: case Sha384:
algorithm = constXMLChar("http://www.w3.org/2001/04/xmldsig-more#sha384") algorithm = constSha384
case Sha256: case Sha256:
algorithm = constXMLChar("http://www.w3.org/2001/04/xmlenc#sha256") algorithm = constSha256
case Sha1: case Sha1:
algorithm = constXMLChar("http://www.w3.org/2000/09/xmldsig#sha1") algorithm = constSha1
case DefaultDigestAlgorithm: case DefaultDigestAlgorithm:
algorithm = constXMLChar("http://www.w3.org/2000/09/xmldsig#sha1") algorithm = constSha1
default: default:
return nil, errInvalidAlgorithm return nil, errInvalidAlgorithm
} }
node := C.xmlSecAddChild(encKeyMethod, strDigestMethod, ns) node := C.xmlSecAddChild(encKeyMethod, constDigestMethod, constDsigNamespace)
C.xmlSetProp(node, strAlgorithm, algorithm) C.xmlSetProp(node, constAlgorithm, algorithm)
} }
// add our certificate to KeyInfoNode // add our certificate to KeyInfoNode