gauthierm Tue Sep 23 17:01:30 2008 UTC
Modified files:
/peardoc authors.xml
/peardoc/en/package/encryption/crypt-gpg examples.xml
Log:
Update end-user documentation for new API in release.
http://cvs.php.net/viewvc.cgi/peardoc/authors.xml?r1=1.18&r2=1.19&diff_format=u
Index: peardoc/authors.xml
diff -u peardoc/authors.xml:1.18 peardoc/authors.xml:1.19
--- peardoc/authors.xml:1.18 Fri Aug 29 11:17:15 2008
+++ peardoc/authors.xml Tue Sep 23 17:01:30 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
<!-- This file resides in the root directory of the source tree,
because it can be shared by all localized versions of the
@@ -51,7 +51,7 @@
</author>
</para>
</listitem>
-
+
<listitem>
<para>
<author>
@@ -64,6 +64,15 @@
<listitem>
<para>
<author>
+ <firstname>Michael</firstname>
+ <surname>Gauthier</surname>
+ </author>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <author>
<firstname>Christophe</firstname>
</author>
http://cvs.php.net/viewvc.cgi/peardoc/en/package/encryption/crypt-gpg/examples.xml?r1=1.1&r2=1.2&diff_format=u
Index: peardoc/en/package/encryption/crypt-gpg/examples.xml
diff -u peardoc/en/package/encryption/crypt-gpg/examples.xml:1.1 peardoc/en/package/encryption/crypt-gpg/examples.xml:1.2
--- peardoc/en/package/encryption/crypt-gpg/examples.xml:1.1 Thu Aug 7 13:21:52 2008
+++ peardoc/en/package/encryption/crypt-gpg/examples.xml Tue Sep 23 17:01:30 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<refentry id="package.encryption.crypt-gpg.examples">
<refnamediv>
@@ -50,11 +50,11 @@
require_once 'Crypt/GPG.php';
-$data = file_get_contents($package_file_name);
-$passphrase = 'test';
-$gpg = Crypt_GPG::factory();
-$signature = $gpg->sign('test@example.com', $data, $passphrase,
- Crypt_GPG::SIGN_MODE_DETACHED);
+$data = file_get_contents($package_file_name);
+
+$gpg = new Crypt_GPG();
+$gpg->addSignKey('test@example.com', 'test');
+$signature = $gpg->sign($data, Crypt_GPG::SIGN_MODE_DETACHED);
echo "Package signature is: ", $signature, "\n";
@@ -85,9 +85,9 @@
-----END PGP SIGNATURE-----
DATA;
-$signed_data = file_get_contents($package_file_name);
-$gpg = Crypt_GPG::factory();
-$details = $gpg->verify($signed_data, $signature);
+$signedData = file_get_contents($package_file_name);
+$gpg = new Crypt_GPG();
+$details = $gpg->verify($signed_data, $signature);
if ($details->isValid()) {
echo "Package is valid.\n";
@@ -117,12 +117,16 @@
$card_number = '411111111111';
$card_type = 'visa';
-$gpg = Crypt_GPG::factory();
-$encrypted = $gpg->encrypt('test@example.com', $card_number);
-$sql = sprintf('insert into payments (card_type, card_number) ' .
- 'values (%s, %s)',
- mysql_real_escape_string($card_type),
- mysql_real_escape_string($card_number));
+
+$gpg = new Crypt_GPG();
+$gpg->addEncryptKey('test@example.com');
+$encrypted = $gpg->encrypt('test@example.com', $card_number);
+
+$sql = sprintf('insert into payments (card_type, card_number) ' .
+ 'values (%s, %s)',
+ mysql_real_escape_string($card_type),
+ mysql_real_escape_string($card_number));
+
mysql_exec($sql);
?>
@@ -145,13 +149,14 @@
// ... connect to database ...
-$gpg = Crypt_GPG::factory();
-$passphrase = 'test';
-$sql = 'select card_type, card_number from payments';
-$rs = mysql_query($sql);
+$gpg = new Crypt_GPG();
+$gpg->addDecryptKey('test@example.com', 'test');
+
+$sql = 'select card_type, card_number from payments';
+$rs = mysql_query($sql);
while ($row = mysql_fetch_object($rs)) {
- echo "Card type: ", $row->card_type, "\n";
- echo "Card number: ", $gpg->decrypt($row->card_number, $passphrase);
+ echo "Card type: ", $row->card_type, "\n";
+ echo "Card number: ", $gpg->decrypt($row->card_number), "\n";
}
?>
@@ -172,7 +177,7 @@
require_once 'Crypt/GPG.php';
-$gpg = Crypt_GPG::factory();
+$gpg = new Crypt_GPG();
echo "My public key is: ", $gpg->exportPublicKey('test@example.com'), "\n";
echo "My key fingerprint is: ",
$gpg->getFingerprint('test@example.com', Crypt_GPG::FORMAT_CANONICAL),
@@ -196,13 +201,13 @@
require_once 'Crypt/GPG.php';
-$gpg = Crypt_GPG::factory();
-$data = 'Hello, World!';
-$passphrase = 'test';
-$signed_data = $gpg->sign('test@example.com', $data, $passphrase,
- Crypt_GPG::SIGN_MODE_CLEAR);
+$data = 'Hello, World!';
+
+$gpg = new Crypt_GPG();
+$gpg->addSignKey('test@example.com', 'test');
+$signedData = $gpg->sign($data, Crypt_GPG::SIGN_MODE_CLEAR);
-echo "Clearsigned message is: ", $signed_data, "\n";
+echo "Clearsigned message is: ", $signedData, "\n";
?>
]]></programlisting>
@@ -222,7 +227,7 @@
require_once 'Crypt/GPG.php';
-$signed_data = <<<DATA
+$signedData = <<<DATA
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello, World!
@@ -234,8 +239,9 @@
-----END PGP SIGNATURE-----
DATA;
-$gpg = Crypt_GPG::factory();
-$details = $gpg->verify($signed_data);
+$gpg = new Crypt_GPG();
+$details = $gpg->verify($signedData);
+
if ($details->isValid()) {
echo "Message is valid.\n";
} else {
|