Update cipher.go

qmuntal · dagood · web-flow · commit bc4ab9f59542 · 2023-09-14T20:25:37.000+02:00
Co-authored-by: Davis Goodin &lt;dagood@users.noreply.github.com&gt;
diff --git a/cipher.go b/cipher.go
@@ -507,7 +507,8 @@ func newCipherCtx(kind cipherKind, mode cipherMode, encrypt cipherOp, key, iv []
 		if C.go_openssl_EVP_CIPHER_CTX_set_key_length(ctx, C.int(len(key))) != 1 {
 			return nil, newOpenSSLError("EVP_CIPHER_CTX_set_key_length")
 		}
-		cipher = nil // don't reset the cipher
+		// Pass nil to the next call to EVP_CipherInit_ex to avoid resetting ctx's cipher.
+		cipher = nil
 	}
 	if C.go_openssl_EVP_CipherInit_ex(ctx, cipher, nil, base(key), base(iv), C.int(encrypt)) != 1 {
 		return nil, fail("unable to initialize EVP cipher ctx")

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,8 @@ func newCipherCtx(kind cipherKind, mode cipherMode, encrypt cipherOp, key, iv []`
`507`	`507`	`if C.go_openssl_EVP_CIPHER_CTX_set_key_length(ctx, C.int(len(key))) != 1 {`
`508`	`508`	`return nil, newOpenSSLError("EVP_CIPHER_CTX_set_key_length")`
`509`	`509`	`}`
`510`		`- cipher = nil // don't reset the cipher`
	`510`	`+ // Pass nil to the next call to EVP_CipherInit_ex to avoid resetting ctx's cipher.`
	`511`	`+ cipher = nil`
`511`	`512`	`}`
`512`	`513`	`if C.go_openssl_EVP_CipherInit_ex(ctx, cipher, nil, base(key), base(iv), C.int(encrypt)) != 1 {`
`513`	`514`	`return nil, fail("unable to initialize EVP cipher ctx")`