store key with contact record

diff --git a/include/diaspora.php b/include/diaspora.php
index 4113e9ce10b4b14bfe5041bf64b93c473c6b5867..f3adc608eafb1fe0a39df125c1226c499e3e462d 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -77,10 +77,15 @@ EOT;
        $ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $outer_aes_key, $decrypted_header, MCRYPT_MODE_CBC, $outer_iv);
 
        $outer_json = json_encode(array('iv' => $b_outer_iv,'key' => $b_outer_aes_key));
+
        $encrypted_outer_key_bundle = '';
        openssl_public_encrypt($outer_json,$encrypted_outer_key_bundle,$pubkey);
-       
+
+       logger('outer_bundle_encrypt: ' . openssl_error_string());
        $b64_encrypted_outer_key_bundle = base64_encode($encrypted_outer_key_bundle);
+
+       logger('outer_bundle: ' . $b64_encrypted_outer_key_bundle . ' key: ' . $pubkey);
+
        $encrypted_header_json_object = json_encode(array('aes_key' => base64_encode($encrypted_outer_key_bundle), 
                'ciphertext' => base64_encode($ciphertext)));
        $cipher_json = base64_encode($encrypted_header_json_object);

diff --git a/mod/follow.php b/mod/follow.php
index 009fe4e9a1cee691d0c76eb5f929cd0221423c4e..df4d2e630a9fb57d22e522a80cea8675c709267d 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -100,9 +100,9 @@ function follow_post(&$a) {
                        $new_relation = CONTACT_IS_FOLLOWER;
 
                // create contact record 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
                        `writable`, `blocked`, `readonly`, `pending` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
                        intval(local_user()),
                        dbesc(datetime_convert()),
                        dbesc($ret['url']),
@@ -114,6 +114,7 @@ function follow_post(&$a) {
                        dbesc($ret['nick']),
                        dbesc($ret['photo']),
                        dbesc($ret['network']),
+                       dbesc($ret['pubkey']),
                        intval($new_relation),
                        intval($ret['priority']),
                        intval($writeable)