/magstudentportal/trunk : revision 17

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/magstudentportal/trunk

« back to all changes in this revision

Viewing changes to src/main/java/common/Utils.java

Committer: Gustav Hartvigsson
Date: 2017-08-28 14:01:22 UTC
mfrom: (15.1.10 magstudentportal-more-db)
Revision ID: gustav.hartvigsson@gmail.com-20170828140122-dfqs6oxweh0zjzlj

* Merged stuff into trunk

files added:
src/main/java/beans

src/main/java/beans/ConfigBean.java

src/main/java/beans/LoginBean.java

src/main/java/common

src/main/java/common/Config.java

src/main/java/common/UserTypeEnum.java

src/main/java/common/Utils.java

src/main/webapp/resources

src/main/webapp/resources/css

src/main/webapp/resources/css/main.css

src/test

src/test/java

src/test/java/AllTests.java

src/test/java/TestHash.java

files renamed:
src/main/java/DB/ => src/main/java/db/

files modified:
README

pom.xml

src/main/java/db/Course.java

src/main/java/db/Lecture.java

src/main/java/db/LecturePK.java

src/main/java/db/Staff.java

src/main/java/db/StaffType.java

src/main/java/db/Student.java

src/main/java/db/StudentAttendance.java

src/main/java/db/StudentAttendancePK.java

src/main/java/db/Teach.java

src/main/java/db/TeachPK.java

src/main/webapp/WEB-INF/templates/page_header.xhtml

src/main/webapp/WEB-INF/web.xml

src/main/webapp/index.xhtml

Show diffs side-by-side

added added

removed removed

src/main/java/common/Utils.java

package common;

import org.bouncycastle.jcajce.provider.digest.SHA3.*;

import org.bouncycastle.util.encoders.*;

public class

Utils {

private Utils () {};

/**

* A hash function that salts the password

* in a way that is pseudo dynamic.

* @param t the text to salt

* @param s the salt

* @return

static public String

real_hash_func (String t, String s) {

int a = t.getBytes()[0];

int b = t.getBytes()[a%t.length()];

StringBuilder sb = new StringBuilder ();

sb.append (t).insert (b, s);

DigestSHA3 md = DigestSHA3 (2048);

md.update (sb.toString().getBytes("UTF-8"));

return Hex.toHexString (md.digits ());

}

/**

* Hash a text with a salt.

* @param t

* @return

static public String

hash_func (String t) {

return real_hash_func(t, common.Config.PW_SALT);

}

Older »