summaryrefslogtreecommitdiffstats
path: root/mozglue/android/NSSBridge.h
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-03-18 10:56:28 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-03-18 10:56:28 +0100
commit912aa47acf658ae26ac24bb3f6ca52b04919f2ee (patch)
treefd551c51c78df5ab60db9c97d2e5deb90aa4ff75 /mozglue/android/NSSBridge.h
parenta24511ca8e19afe4d19008ba903e1edab0af3223 (diff)
parentea1b2e81e4c092a3b871bed49e907fba20483bdc (diff)
downloadUXP-912aa47acf658ae26ac24bb3f6ca52b04919f2ee.tar
UXP-912aa47acf658ae26ac24bb3f6ca52b04919f2ee.tar.gz
UXP-912aa47acf658ae26ac24bb3f6ca52b04919f2ee.tar.lz
UXP-912aa47acf658ae26ac24bb3f6ca52b04919f2ee.tar.xz
UXP-912aa47acf658ae26ac24bb3f6ca52b04919f2ee.zip
Merge branch 'ported-upstream'
Diffstat (limited to 'mozglue/android/NSSBridge.h')
-rw-r--r--mozglue/android/NSSBridge.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/mozglue/android/NSSBridge.h b/mozglue/android/NSSBridge.h
index 77bcd1172..83ec8d749 100644
--- a/mozglue/android/NSSBridge.h
+++ b/mozglue/android/NSSBridge.h
@@ -39,8 +39,4 @@ NSS_WRAPPER(PK11_GetInternalKeySlot, PK11SlotInfo *, void)
NSS_WRAPPER(PK11_NeedUserInit, PRBool, PK11SlotInfo *)
NSS_WRAPPER(PK11_InitPin, SECStatus, PK11SlotInfo*, const char*, const char*)
-bool setPassword(PK11SlotInfo *slot);
-SECStatus doCrypto(JNIEnv* jenv, const char *path, const char *value, char** result, bool doEncrypt);
-SECStatus encode(const unsigned char *data, int32_t dataLen, char **_retval);
-SECStatus decode(const char *data, unsigned char **result, int32_t * _retval);
#endif /* NSS_h */