Cross platform (Linux, Windows, Mac for Password Gorilla itself).
Several Android apps that inter-operate with the same format password storage file (Bruce Shiner's PasswordSafe format file). Scroll part way down the above page to find references to some of the Android apps.
Your passwords are stored in an encrypted file stored on your local machine. You can do with the encrypted file what you wish. PWGorilla itself includes a merge feature that merges encrypted files together, and alerts you to the differences so you can fix things up.
Its browser integration is through the OS clipboard. However on Linux the integration is almost to the level of an auto-type plugin (because the X11 clipboard works in a way that allows the better integration).
So, it fits these of your requirements:
Cross platform (Linux, Windows [check], Android [secondary app])
Lets you keep your own data and sync it however you want [check].
Integrates with browsers [partial check].
So it's close. Not 100%, but close. It is also GPL open source, so you've got nothing to lose in giving it a try.
Cross platform (Linux, Windows, Mac for Password Gorilla itself).
Several Android apps that inter-operate with the same format password storage file (Bruce Shiner's PasswordSafe format file). Scroll part way down the above page to find references to some of the Android apps.
Your passwords are stored in an encrypted file stored on your local machine. You can do with the encrypted file what you wish. PWGorilla itself includes a merge feature that merges encrypted files together, and alerts you to the differences so you can fix things up.
Its browser integration is through the OS clipboard. However on Linux the integration is almost to the level of an auto-type plugin (because the X11 clipboard works in a way that allows the better integration).
So, it fits these of your requirements:
Cross platform (Linux, Windows [check], Android [secondary app])
Lets you keep your own data and sync it however you want [check].
Integrates with browsers [partial check].
So it's close. Not 100%, but close. It is also GPL open source, so you've got nothing to lose in giving it a try.
[edit: add a couple paragraph breaks]