Commit576ac4b

committed

Fix initialization bug in pgcrypto openssl code. Marko Kreen

1 parent7e33fae commit576ac4bCopy full SHA for 576ac4b

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ decode('01 01 01 01 01 01 01 01`
`17`	`17`	`select encode(encrypt('', 'foo', '3des'), 'hex');`
`18`	`18`	`encode`
`19`	`19`	`------------------`
`20`		`-9b641a6936249eb4`
	`20`	`+752111e37a2d7ac3`
`21`	`21`	`(1 row)`
`22`	`22`
`23`	`23`	`-- 10 bytes key`
`24`	`24`	`select encode(encrypt('foo', '0123456789', '3des'), 'hex');`
`25`	`25`	`encode`
`26`	`26`	`------------------`
`27`		`-6f02b7076a366504`
	`27`	`+d2fb8baa1717cb02`
`28`	`28`	`(1 row)`
`29`	`29`
`30`	`30`	`-- 22 bytes key`
`@@ -45,10 +45,10 @@ select decrypt(encrypt('foo', '0123456', '3des'), '0123456', '3des');`
`45`	`45`	`select encode(encrypt_iv('foo', '0123456', 'abcd', '3des'), 'hex');`
`46`	`46`	`encode`
`47`	`47`	`------------------`
`48`		`-df27c264fb24ed7a`
	`48`	`+50735067b073bb93`
`49`	`49`	`(1 row)`
`50`	`50`
`51`		`-select decrypt_iv(decode('df27c264fb24ed7a', 'hex'), '0123456', 'abcd', '3des');`
	`51`	`+select decrypt_iv(decode('50735067b073bb93', 'hex'), '0123456', 'abcd', '3des');`
`52`	`52`	`decrypt_iv`
`53`	`53`	`------------`
`54`	`54`	`foo`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`27`	`27`	`* SUCH DAMAGE.`
`28`	`28`	`*`
`29`		`- * $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.19 2005/07/04 02:02:01 momjian Exp $`
	`29`	`+ * $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.20 2005/07/05 18:15:36 tgl Exp $`
`30`	`30`	`*/`
`31`	`31`
`32`	`32`	`#include<postgres.h>`
`@@ -393,7 +393,7 @@ ossl_des3_init(PX_Cipher * c, const uint8 key, unsigned klen, const uint8 iv)`
`393`	`393`
`394`	`394`	`memset(&xkey1,0,sizeof(xkey1));`
`395`	`395`	`memset(&xkey2,0,sizeof(xkey2));`
`396`		`-memset(&xkey2,0,sizeof(xkey2));`
	`396`	`+memset(&xkey3,0,sizeof(xkey3));`
`397`	`397`	`memcpy(&xkey1,key,klen>8 ?8 :klen);`
`398`	`398`	`if (klen>8)`
`399`	`399`	`memcpy(&xkey2,key+8, (klen-8)>8 ?8 : (klen-8));`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ select decrypt(encrypt('foo', '0123456', '3des'), '0123456', '3des');`
`22`	`22`
`23`	`23`	`-- iv`
`24`	`24`	`select encode(encrypt_iv('foo','0123456','abcd','3des'),'hex');`
`25`		`-select decrypt_iv(decode('df27c264fb24ed7a','hex'),'0123456','abcd','3des');`
	`25`	`+select decrypt_iv(decode('50735067b073bb93','hex'),'0123456','abcd','3des');`
`26`	`26`

Comments

(0)