diff options
| author | friendica <info@friendica.com> | 2012-07-11 16:54:18 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-11 16:54:18 -0700 |
| commit | 3f414aec63257f7e9e6aa19671502794f9c1d524 (patch) | |
| tree | a4be655071e84b81b3674c3bb9acddfe5306d89a /include/user.php | |
| parent | 71afdf3d9c8cce686f0b996f4ab08e480edfc5d0 (diff) | |
| download | volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.tar.gz volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.tar.bz2 volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.zip | |
get rid of special "short salmon key" for statusnet
Diffstat (limited to 'include/user.php')
| -rw-r--r-- | include/user.php | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/include/user.php b/include/user.php index 039b30bbd..ba1b4a9ee 100644 --- a/include/user.php +++ b/include/user.php @@ -162,24 +162,9 @@ function create_user($arr) { $prvkey = $keys['prvkey']; $pubkey = $keys['pubkey']; - /** - * - * Create another keypair for signing/verifying - * salmon protocol messages. We have to use a slightly - * less robust key because this won't be using openssl - * but the phpseclib. Since it is PHP interpreted code - * it is not nearly as efficient, and the larger keys - * will take several minutes each to process. - * - */ - - $sres = new_keypair(512); - $sprvkey = $sres['prvkey']; - $spubkey = $sres['pubkey']; - $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`, - `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class` ) - VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s' )", + `pubkey`, `prvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class` ) + VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s' )", dbesc(generate_user_guid()), dbesc($username), dbesc($new_password_encoded), @@ -188,8 +173,6 @@ function create_user($arr) { dbesc($nickname), dbesc($pubkey), dbesc($prvkey), - dbesc($spubkey), - dbesc($sprvkey), dbesc(datetime_convert()), intval($verified), intval($blocked), |