Merge remote-tracking branch 'origin/master'

.gitignore

@@ -1 +1,2 @@
-pm-server/.idea/workspace.xml
+pm-server/.idea/
+pm-server/out/

background.js

@@ -264,13 +264,13 @@ function test() {
 function encryptPwd(mpw, plaintext){ // @TODO: debug!!!!!!!!!!!!!!!!
 	var arr = encodePwd(plaintext);
 	var ctbits = encrypt(mpw, arr);
-	return sjcl.codec.hex.fromBits(ctbits);
+	return sjcl.codec.base64.fromBits(ctbits);
 	// return ctbits;
 }
 
 function decryptPwd(mpw, ciphertext){
 	// var arr = decrypt(mpw, ciphertext);
-	var arr = decrypt(mpw, sjcl.codec.hex.toBits(ciphertext));
+	var arr = decrypt(mpw, sjcl.codec.base64.toBits(ciphertext));
 	return decodePwd(arr);
 }
 

db_file.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `pm-extension`.`user_info` (
+  `username` VARCHAR(255) NOT NULL,
+  `password_hint` VARCHAR(255) NOT NULL,
+  `cipher_checksum` VARCHAR(255) NOT NULL,
+  PRIMARY KEY (`username`),
+  UNIQUE INDEX `username_UNIQUE` (`username` ASC))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8;

pm-server/src/servlet/AddUserServlet.java → pm-server/src/servlet/AddAccountServlet.java

@@ -15,9 +15,9 @@
 /**
  * Created by lss on 2016/5/9.
  */
-@WebServlet("/AddUserServlet")
-public class AddUserServlet extends HttpServlet{
-    public AddUserServlet(){
+@WebServlet("/AddAccountServlet")
+public class AddAccountServlet extends HttpServlet{
+    public AddAccountServlet(){
         super();
     }