Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit87688dd

Browse files
committed
The large one adds support for RSA keys and reorganizes
the pubkey functions a bit. The actual RSA-specific codethere is tiny, most of the patch consists of reorg of thepubkey code, as lots of it was written as elgamal-only.---------------------------------------------------------------------------The SHLIB section was copy-pasted from somewhere and containsseveral unnecessary libs. This cleans it up a bit. -lcrypt we don't use system crypt() -lssl, -lssleay32 no SSL here -lz in win32 section already added on previous line -ldes The chance anybody has it is pretty low. And the chance pgcrypto works with it is even lower.Also trim the win32 section.---------------------------------------------------------------------------It is already disabled in Makefile, remove code too.---------------------------------------------------------------------------I was bit hasty making the random exponent 'k' a prime. Further researhshows that Elgamal encryption has no specific needs in respect to k,any random number is fine.It is bit different for signing, there it needs to be 'relatively prime'to p - 1, that means GCD(k, p-1) == 1, which is also a lot lighter thanfull primality. As we don't do signing, this can be ignored.This brings major speedup to Elgamal encryption.---------------------------------------------------------------------------o pgp_mpi_free: Accept NULLso pgp_mpi_cksum: result should be 16bito Remove function name from error messages - to be similar to other SQL functions, and it does not match anyway the called functiono remove couple junk lines---------------------------------------------------------------------------o Support for RSA encryptiono Big reorg to better separate generic and algorithm-specific code.o Regression tests for RSA.---------------------------------------------------------------------------o Tom stuck a CVS id into file. I doubt the usefulness of it, but if it needs to be in the file then rather at the end. Also tag it as comment for asciidoc.o Mention bytea vs. text differenceo Couple clarifications---------------------------------------------------------------------------There is a choice whether to update it with pgp functions orremove it. I decided to remove it, updating is pointless.I've tried to keep the core of pgcrypto relatively independentfrom main PostgreSQL, to make it easy to use externally if needed,and that is good. Eg. that made development of PGP functions muchnicer.But I have no plans to release it as generic library, so keeping suchdocup-to-date is waste of time. If anyone is interested in using it inother products, he can probably bother to read the source too.Commented source is another thing - I'll try to make another passover code to see if there is anything non-obvious that would needmore comments.---------------------------------------------------------------------------Marko Kreen
1 parentabecf1a commit87688dd

23 files changed

+808
-278
lines changed

‎contrib/pgcrypto/Makefile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.21 2005/07/10 18:32:55 momjian Exp $
2+
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.22 2005/08/13 02:06:20 momjian Exp $
33
#
44

55
INT_SRCS = md5.c sha1.c sha2.c internal.c blf.c rijndael.c\
@@ -56,17 +56,13 @@ endif
5656
# Add libraries that pgcrypto depends (or might depend) on into the
5757
# shared library link. (The order in which you list them here doesn't
5858
# matter.)
59-
SHLIB_LINK +=$(filter -lcrypt -ldes -lcrypto -lssl -lz,$(LIBS))
59+
SHLIB_LINK +=$(filter -lcrypto -lz,$(LIBS))
6060
ifeq ($(PORTNAME), win32)
61-
SHLIB_LINK +=$(filter -leay32 -lssleay32 -lz,$(LIBS))
62-
endif
63-
64-
# to make ws2_32.lib the last library (must occur after definition of PORTNAME)
65-
ifeq ($(PORTNAME),win32)
61+
SHLIB_LINK +=$(filter -leay32,$(LIBS))
62+
# those must be at the end
6663
SHLIB_LINK += -lwsock32 -lws2_32
6764
endif
6865

69-
7066
rijndael.o: rijndael.tbl
7167

7268
rijndael.tbl:

‎contrib/pgcrypto/README.pgcrypto

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
$PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.12 2005/07/18 17:17:12 tgl Exp $
21

32
pgcrypto - cryptographic functions for PostgreSQL
43
=================================================
@@ -278,7 +277,7 @@ cracking. Or may not.
278277
-------------------
279278

280279
The functions here implement the encryption part of OpenPGP (RFC2440)
281-
standard.
280+
standard. Supported are both symmetric-key and public-key encryption.
282281

283282

284283
5.1. Overview
@@ -334,6 +333,10 @@ Options are described in section 5.7.
334333

335334
Decrypt a symmetric-key encrypted PGP message.
336335

336+
Decrypting bytea data with `pgp_sym_decrypt` is disallowed.
337+
This is to avoid outputting invalid character data. Decrypting
338+
originally textual data with `pgp_sym_decrypt_bytea` is fine.
339+
337340
Options are described in section 5.7.
338341

339342

@@ -362,6 +365,10 @@ key is password-protected, you must give the password in `psw`. If
362365
there is no password, but you want to specify option for function, you
363366
need to give empty password.
364367

368+
Decrypting bytea data with `pgp_pub_decrypt` is disallowed.
369+
This is to avoid outputting invalid character data. Decrypting
370+
originally textual data with `pgp_pub_decrypt_bytea` is fine.
371+
365372
Options are described in section 5.7.
366373

367374

@@ -422,7 +429,6 @@ cipher-algo::
422429
Default: aes128
423430
Applies: pgp_sym_encrypt, pgp_pub_encrypt
424431

425-
426432
compress-algo::
427433
Which compression algorithm to use. Needs building with zlib.
428434

@@ -492,7 +498,7 @@ s2k-cipher-algo::
492498
Which cipher to use for encrypting separate session key.
493499

494500
Values: bf, aes, aes128, aes192, aes256
495-
Default:same as cipher-algo.
501+
Default:use cipher-algo.
496502
Applies: pgp_sym_encrypt
497503

498504
unicode-mode::
@@ -513,7 +519,10 @@ Generate a new key:
513519

514520
gpg --gen-key
515521

516-
You need to pick "DSA and Elgamal" key type, others are sign-only.
522+
The preferred key type is "DSA and Elgamal".
523+
524+
For RSA encryption you must create either DSA or RSA sign-only key
525+
as master and then add RSA encryption subkey with `gpg --edit-key`.
517526

518527
List keys:
519528

@@ -531,16 +540,23 @@ You need to use `dearmor()` on them before giving giving them to
531540
pgp_pub_* functions. Or if you can handle binary data, you can drop
532541
"-a" from gpg.
533542

543+
For more details see `man gpg`, http://www.gnupg.org/gph/en/manual.html[
544+
The GNU Privacy Handbook] and other docs on http://www.gnupg.org[] site.
545+
534546

535547
5.10. Limitations of PGP code
536548
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
537549

538550
- No support for signing. That also means that it is not checked
539551
whether the encryption subkey belongs to master key.
540552

541-
- No support for RSA keys. Only Elgamal encryption keys are supported
553+
- No support for encryption key as master key. As such practice
554+
is generally discouraged, it should not be a problem.
542555

543-
- No support for several encryption subkeys.
556+
- No support for several subkeys. This may seem like a problem, as this
557+
is common practice. On the other hand, you should not use your regular
558+
GPG/PGP keys with pgcrypto, but create new ones, as the usage scenario
559+
is rather different.
544560

545561

546562
6. Raw encryption
@@ -631,6 +647,9 @@ I have used code from following sources:
631647
9.1. Useful reading
632648
~~~~~~~~~~~~~~~~~~~~~
633649

650+
http://www.gnupg.org/gph/en/manual.html[]::
651+
The GNU Privacy Handbook
652+
634653
http://www.openwall.com/crypt/[]::
635654
Describes the crypt-blowfish algorithm.
636655

@@ -673,3 +692,7 @@ http://jlcooke.ca/random/[]::
673692

674693
http://www.cs.ut.ee/~helger/crypto/[]::
675694
Collection of cryptology pointers.
695+
696+
697+
// $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.13 2005/08/13 02:06:20 momjian Exp $
698+

‎contrib/pgcrypto/expected/pgp-armor.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ em9va2E=
9999
=ZZZZ
100100
-----END PGP MESSAGE-----
101101
');
102-
ERROR:dearmor:Corrupt ascii-armor
102+
ERROR: Corrupt ascii-armor

‎contrib/pgcrypto/expected/pgp-encrypt.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ NOTICE: pgp_decrypt: unexpected compress_algo: expected 1 got 0
4343

4444
-- bytea as text
4545
select pgp_sym_decrypt(pgp_sym_encrypt_bytea('Binary', 'baz'), 'baz');
46-
ERROR:pgp_decrypt error:Not text data
46+
ERROR: Not text data
4747
-- text as bytea
4848
select pgp_sym_decrypt_bytea(pgp_sym_encrypt('Text', 'baz'), 'baz');
4949
pgp_sym_decrypt_bytea

‎contrib/pgcrypto/expected/pgp-info.out

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,19 @@ select pgp_key_id(dearmor(pubkey)) from keytbl where id=3;
2121
(1 row)
2222

2323
select pgp_key_id(dearmor(pubkey)) from keytbl where id=4; -- should fail
24-
ERROR: Nousable key found (expecting Elgamal key)
24+
ERROR: Noencryption key found
2525
select pgp_key_id(dearmor(pubkey)) from keytbl where id=5;
2626
pgp_key_id
2727
------------------
2828
D936CF64BB73F466
2929
(1 row)
3030

31+
select pgp_key_id(dearmor(pubkey)) from keytbl where id=6;
32+
pgp_key_id
33+
------------------
34+
FD0206C409B74875
35+
(1 row)
36+
3137
select pgp_key_id(dearmor(seckey)) from keytbl where id=1;
3238
pgp_key_id
3339
------------------
@@ -47,19 +53,26 @@ select pgp_key_id(dearmor(seckey)) from keytbl where id=3;
4753
(1 row)
4854

4955
select pgp_key_id(dearmor(seckey)) from keytbl where id=4; -- should fail
50-
ERROR: Nousable key found (expecting Elgamal key)
56+
ERROR: Noencryption key found
5157
select pgp_key_id(dearmor(seckey)) from keytbl where id=5;
5258
pgp_key_id
5359
------------------
5460
D936CF64BB73F466
5561
(1 row)
5662

63+
select pgp_key_id(dearmor(seckey)) from keytbl where id=6;
64+
pgp_key_id
65+
------------------
66+
FD0206C409B74875
67+
(1 row)
68+
5769
select pgp_key_id(dearmor(data)) as data_key_id
5870
from encdata order by id;
5971
data_key_id
6072
------------------
6173
D936CF64BB73F466
6274
2C226E1FFE5CC7D4
6375
B68504FD128E1FF9
64-
(3 rows)
76+
FD0206C409B74875
77+
(4 rows)
6578

‎contrib/pgcrypto/expected/pgp-pubkey-decrypt.out

Lines changed: 118 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,97 @@ saCh6QCfR1O48O8nYN93SPSfIFZK5rEmdv8=
326326
=Y6Qv
327327
-----END PGP PRIVATE KEY BLOCK-----
328328
');
329+
insert into keytbl (id, name, pubkey, seckey)
330+
values (6, 'rsaenc2048', '
331+
-----BEGIN PGP PUBLIC KEY BLOCK-----
332+
Version: GnuPG v1.4.1 (GNU/Linux)
333+
334+
mQELBELr2m0BCADOrnknlnXI0EzRExf/TgoHvK7Xx/E0keWqV3KrOyC3/tY2KOrj
335+
UVxaAX5pkFX9wdQObGPIJm06u6D16CH6CildX/vxG7YgvvKzK8JGAbwrXAfk7OIW
336+
czO2zRaZGDynoK3mAxHRBReyTKtNv8rDQhuZs6AOozJNARdbyUO/yqUnqNNygWuT
337+
4htFDEuLPIJwAbMSD0BvFW6YQaPdxzaAZm3EWVNbwDzjgbBUdBiUUwRdZIFUhsjJ
338+
dirFdy5+uuZru6y6CNC1OERkJ7P8EyoFiZckAIE5gshVZzNuyLOZjc5DhWBvLbX4
339+
NZElAnfiv+4nA6y8wQLSIbmHA3nqJaBklj85AAYptCVSU0EgMjA0OCBFbmMgPHJz
340+
YTIwNDhlbmNAZXhhbXBsZS5vcmc+iQE0BBMBAgAeBQJC69ptAhsDBgsJCAcDAgMV
341+
AgMDFgIBAh4BAheAAAoJEMiZ6pNEGVVZHMkIAJtGHHZ9iM8Yq1rr0zl1L6SvlQP8
342+
JCaxHa31wH3PKqGtq2M+cpb2rXf7gAY/doHJPXggfVzkyFrysmQ1gPbDGYLyOutw
343+
+IkhihEb5bWxQBNj+3zAFs1YX6v2HXWbSUSmyY1V9/+NTtKk03olDc/swd3lXzku
344+
UOhcgfpBgIt3Q+MpT6M2+OIF7lVfSb1rWdpwTfGhZzW9szQOeoS4gPvxCCRyuabQ
345+
RJ6DWH61F8fFIDJg1z+A/Obx4fqX6GOA69RzgZ3oukFBIXxNwV9PZNnAmHtZVYO8
346+
0g/oVYBbuvOYedffDBeQarhERZ5W2TnIE+nqY61YOLBqosliygdZTXULzNi5AQsE
347+
QuvaugEIAOuCJZdkzORA6e1lr81Lnr4JzMsVBFA+X/yIkBbV6qX/A4nVSLAZKNPX
348+
z1YIrMTu+1rMIiy10IWbA6zgMTpzPhJRfgePONgdnCYyK5Ksh5/C5ntzKwwGwxfK
349+
lAXIxJurCHXTbEa+YvPdn76vJ3HsXOXVEL+fLb4U3l3Ng87YM202Lh1Ha2MeS2zE
350+
FZcAoKbFqAAjDLEai64SoOFh0W3CsD1DL4zmfp+YZrUPHTtZadsi53i4KKW/ws9U
351+
rHlolqYNhYze/uRLyfnUx9PN4r/GhEzauyDMV0smo91uB3aewPft+eCpmeWnu0PF
352+
JVK4xyRmhIq2rVCw16a1pBJirvGM+y0ABimJAR8EGAECAAkFAkLr2roCGwwACgkQ
353+
yJnqk0QZVVku1wgAg1bLSjPkhw+ldG5HzumpqR84+JKyozdJaJzefu2+1iqYE0B0
354+
WLz2PJVIiK41xiEkKhBvTOQYuXmtWqAWXptD91P5SoXoNJWLQO3TNwarANhHxkWg
355+
w/TOUxQqoctlRUej5NDD+4eW5G9lcS1FEGuKDWtX096u80vO+TbyJjvx2eVM1k+X
356+
dmeYsGOiNgDimCreJGYc14G7eY9jt24gw10n1sMAKI1qm6lcoHqZ9OOyla+wJdro
357+
PYZGO7R8+1O9R22WrK6BYDT5j/1JwMZqbOESjNvDEVT0yOHClCHRN4CChbt6LhKh
358+
CLUNdz/udIt0JAC6c/HdPLSW3HnmM3+iNj+Kug==
359+
=pwU2
360+
-----END PGP PUBLIC KEY BLOCK-----
361+
', '
362+
-----BEGIN PGP PRIVATE KEY BLOCK-----
363+
Version: GnuPG v1.4.1 (GNU/Linux)
364+
365+
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
417+
=UKh3
418+
-----END PGP PRIVATE KEY BLOCK-----
419+
');
329420
-- elg1024 / aes128
330421
insert into encdata (id, data) values (1, '
331422
-----BEGIN PGP MESSAGE-----
@@ -393,6 +484,22 @@ DYKcOy60/OHMWVvpw6trAoA+iP+cVWPtrbRvLglTVTfYmi1ToZDDipkALBhndQ==
393484
=L/M/
394485
-----END PGP MESSAGE-----
395486
');
487+
-- rsaenc2048 / aes128
488+
insert into encdata (id, data) values (4, '
489+
-----BEGIN PGP MESSAGE-----
490+
Version: GnuPG v1.4.1 (GNU/Linux)
491+
492+
hQEMA/0CBsQJt0h1AQf+JyYnCiortj26P11zk28MKOGfWpWyAhuIgwbJXsdQ+e6r
493+
pEyyqs9GC6gI7SNF6+J8B/gsMwvkAL4FHAQCvA4ZZ6eeXR1Of4YG22JQGmpWVWZg
494+
DTyfhA2vkczuqfAD2tgUpMT6sdyGkQ/fnQ0lknlfHgC5GRx7aavOoAKtMqiZW5PR
495+
yae/qR48mjX7Mb+mLvbagv9mHEgQSmHwFpaq2k456BbcZ23bvCmBnCvqV/90Ggfb
496+
VP6gkSoFVsJ19RHsOhW1dk9ehbl51WB3zUOO5FZWwUTY9DJvKblRK/frF0+CXjE4
497+
HfcZXHSpSjx4haGGTsMvEJ85qFjZpr0eTGOdY5cFhNJAAVP8MZfji7OhPRAoOOIK
498+
eRGOCkao12pvPyFTFnPd5vqmyBbdNpK4Q0hS82ljugMJvM0p3vJZVzW402Kz6iBL
499+
GQ==
500+
=XHkF
501+
-----END PGP MESSAGE-----
502+
');
396503
-- successful decrypt
397504
select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
398505
from keytbl, encdata where keytbl.id=1 and encdata.id=1;
@@ -415,22 +522,29 @@ from keytbl, encdata where keytbl.id=3 and encdata.id=3;
415522
Secret msg
416523
(1 row)
417524

525+
select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
526+
from keytbl, encdata where keytbl.id=6 and encdata.id=4;
527+
pgp_pub_decrypt
528+
-----------------
529+
Secret message.
530+
(1 row)
531+
418532
-- wrong key
419533
select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
420534
from keytbl, encdata where keytbl.id=2 and encdata.id=1;
421-
ERROR:pgp_decrypt error: Data is not encrypted with this key
535+
ERROR:Wrong key
422536
-- sign-only key
423537
select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
424538
from keytbl, encdata where keytbl.id=4 and encdata.id=1;
425-
ERROR:pgp_decrypt error:Nousable key found (expecting Elgamal key)
539+
ERROR: Noencryption key found
426540
-- password-protected secret key, no password
427541
select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
428542
from keytbl, encdata where keytbl.id=5 and encdata.id=1;
429-
ERROR:pgp_decrypt error:Need password for secret key
543+
ERROR: Need password for secret key
430544
-- password-protected secret key, wrong password
431545
select pgp_pub_decrypt(dearmor(data), dearmor(seckey), 'foo')
432546
from keytbl, encdata where keytbl.id=5 and encdata.id=1;
433-
ERROR:pgp_decrypt error:Corrupt data
547+
ERROR: Corrupt data
434548
-- password-protected secret key, right password
435549
select pgp_pub_decrypt(dearmor(data), dearmor(seckey), 'parool')
436550
from keytbl, encdata where keytbl.id=5 and encdata.id=1;

‎contrib/pgcrypto/expected/pgp-pubkey-encrypt.out

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,27 @@ from keytbl where keytbl.id=3;
2929
Secret msg
3030
(1 row)
3131

32+
select pgp_pub_decrypt(
33+
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
34+
dearmor(seckey))
35+
from keytbl where keytbl.id=6;
36+
pgp_pub_decrypt
37+
-----------------
38+
Secret msg
39+
(1 row)
40+
3241
-- try with rsa-sign only
3342
select pgp_pub_decrypt(
3443
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
3544
dearmor(seckey))
3645
from keytbl where keytbl.id=4;
37-
ERROR:pgp_encrypt error:Nousable key found (expecting Elgamal key)
46+
ERROR: Noencryption key found
3847
-- try with secret key
3948
select pgp_pub_decrypt(
4049
pgp_pub_encrypt('Secret msg', dearmor(seckey)),
4150
dearmor(seckey))
4251
from keytbl where keytbl.id=1;
43-
ERROR:pgp_encrypt error:Refusing to encrypt with secret key
52+
ERROR: Refusing to encrypt with secret key
4453
-- does text-to-bytea works
4554
select pgp_pub_decrypt_bytea(
4655
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
@@ -56,4 +65,4 @@ select pgp_pub_decrypt(
5665
pgp_pub_encrypt_bytea('Secret msg', dearmor(pubkey)),
5766
dearmor(seckey))
5867
from keytbl where keytbl.id=1;
59-
ERROR:pgp_decrypt error:Not text data
68+
ERROR: Not text data

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp