updated binaries to v1.5.5 to support mixed go libraries

jerson · Sep 27, 2022 · 81ad4f2 · 81ad4f2
1 parent 7d23cbb
commit 81ad4f2
Show file tree

Hide file tree

Showing 35 changed files with 50 additions and 26 deletions.
diff --git a/android/src/main/jniLibs/arm64-v8a/librsa_bridge.h b/android/src/main/jniLibs/arm64-v8a/librsa_bridge.h
@@ -5,7 +5,7 @@
 
 #line 1 "cgo-builtin-export-prolog"
 
-#include <stddef.h> /* for ptrdiff_t below */
+#include <stddef.h>
 
 #ifndef GO_CGO_EXPORT_PROLOGUE_H
 #define GO_CGO_EXPORT_PROLOGUE_H
@@ -46,11 +46,17 @@ typedef long long GoInt64;
 typedef unsigned long long GoUint64;
 typedef GoInt64 GoInt;
 typedef GoUint64 GoUint;
-typedef __SIZE_TYPE__ GoUintptr;
+typedef size_t GoUintptr;
 typedef float GoFloat32;
 typedef double GoFloat64;
+#ifdef _MSC_VER
+#include <complex.h>
+typedef _Fcomplex GoComplex64;
+typedef _Dcomplex GoComplex128;
+#else
 typedef float _Complex GoComplex64;
 typedef double _Complex GoComplex128;
+#endif
 
 /*
   static assertion to make sure the file is being used on architecture

diff --git a/android/src/main/jniLibs/arm64-v8a/librsa_bridge.so b/android/src/main/jniLibs/arm64-v8a/librsa_bridge.so
diff --git a/android/src/main/jniLibs/armeabi-v7a/librsa_bridge.h b/android/src/main/jniLibs/armeabi-v7a/librsa_bridge.h
@@ -5,7 +5,7 @@
 
 #line 1 "cgo-builtin-export-prolog"
 
-#include <stddef.h> /* for ptrdiff_t below */
+#include <stddef.h>
 
 #ifndef GO_CGO_EXPORT_PROLOGUE_H
 #define GO_CGO_EXPORT_PROLOGUE_H
@@ -46,11 +46,17 @@ typedef long long GoInt64;
 typedef unsigned long long GoUint64;
 typedef GoInt32 GoInt;
 typedef GoUint32 GoUint;
-typedef __SIZE_TYPE__ GoUintptr;
+typedef size_t GoUintptr;
 typedef float GoFloat32;
 typedef double GoFloat64;
+#ifdef _MSC_VER
+#include <complex.h>
+typedef _Fcomplex GoComplex64;
+typedef _Dcomplex GoComplex128;
+#else
 typedef float _Complex GoComplex64;
 typedef double _Complex GoComplex128;
+#endif
 
 /*
   static assertion to make sure the file is being used on architecture

diff --git a/android/src/main/jniLibs/armeabi-v7a/librsa_bridge.so b/android/src/main/jniLibs/armeabi-v7a/librsa_bridge.so
diff --git a/android/src/main/jniLibs/x86/librsa_bridge.h b/android/src/main/jniLibs/x86/librsa_bridge.h
@@ -5,7 +5,7 @@
 
 #line 1 "cgo-builtin-export-prolog"
 
-#include <stddef.h> /* for ptrdiff_t below */
+#include <stddef.h>
 
 #ifndef GO_CGO_EXPORT_PROLOGUE_H
 #define GO_CGO_EXPORT_PROLOGUE_H
@@ -46,11 +46,17 @@ typedef long long GoInt64;
 typedef unsigned long long GoUint64;
 typedef GoInt32 GoInt;
 typedef GoUint32 GoUint;
-typedef __SIZE_TYPE__ GoUintptr;
+typedef size_t GoUintptr;
 typedef float GoFloat32;
 typedef double GoFloat64;
+#ifdef _MSC_VER
+#include <complex.h>
+typedef _Fcomplex GoComplex64;
+typedef _Dcomplex GoComplex128;
+#else
 typedef float _Complex GoComplex64;
 typedef double _Complex GoComplex128;
+#endif
 
 /*
   static assertion to make sure the file is being used on architecture

diff --git a/android/src/main/jniLibs/x86/librsa_bridge.so b/android/src/main/jniLibs/x86/librsa_bridge.so
diff --git a/android/src/main/jniLibs/x86_64/librsa_bridge.h b/android/src/main/jniLibs/x86_64/librsa_bridge.h
@@ -5,7 +5,7 @@
 
 #line 1 "cgo-builtin-export-prolog"
 
-#include <stddef.h> /* for ptrdiff_t below */
+#include <stddef.h>
 
 #ifndef GO_CGO_EXPORT_PROLOGUE_H
 #define GO_CGO_EXPORT_PROLOGUE_H
@@ -46,11 +46,17 @@ typedef long long GoInt64;
 typedef unsigned long long GoUint64;
 typedef GoInt64 GoInt;
 typedef GoUint64 GoUint;
-typedef __SIZE_TYPE__ GoUintptr;
+typedef size_t GoUintptr;
 typedef float GoFloat32;
 typedef double GoFloat64;
+#ifdef _MSC_VER
+#include <complex.h>
+typedef _Fcomplex GoComplex64;
+typedef _Dcomplex GoComplex128;
+#else
 typedef float _Complex GoComplex64;
 typedef double _Complex GoComplex128;
+#endif
 
 /*
   static assertion to make sure the file is being used on architecture

diff --git a/android/src/main/jniLibs/x86_64/librsa_bridge.so b/android/src/main/jniLibs/x86_64/librsa_bridge.so
diff --git a/ios/librsa_bridge.a b/ios/librsa_bridge.a
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-fast-rsa",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "library for use RSA",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/src/bridge.ts b/src/bridge.ts
@@ -1,7 +1,7 @@
 export { Hash } from './model/hash';
 export { KeyPair } from './model/key-pair';
-export { PEMCipher } from './model/pemcipher';
-export { PKCS12KeyPair } from './model/pkcs12key-pair';
+export { PEMCipher } from './model/p-e-m-cipher';
+export { PKCS12KeyPair } from './model/p-k-c-s12-key-pair';
 export { PrivateKeyInfo } from './model/private-key-info';
 export { PublicKeyInfo } from './model/public-key-info';
 export { SaltLength } from './model/salt-length';
diff --git a/src/index.tsx b/src/index.tsx
@@ -5,24 +5,24 @@ import { GenerateRequest } from './model/generate-request';
 import { KeyPairResponse } from './model/key-pair-response';
 import { StringResponse } from './model/string-response';
 import { ConvertPrivateKeyRequest } from './model/convert-private-key-request';
-import { ConvertJWTRequest } from './model/convert-jwtrequest';
+import { ConvertJWTRequest } from './model/convert-j-w-t-request';
 import { ConvertKeyPairRequest } from './model/convert-key-pair-request';
-import { ConvertPKCS12Request } from './model/convert-pkcs12request';
+import { ConvertPKCS12Request } from './model/convert-p-k-c-s12-request';
 import { ConvertPublicKeyRequest } from './model/convert-public-key-request';
 import { DecryptPrivateKeyRequest } from './model/decrypt-private-key-request';
 import { EncryptPrivateKeyRequest } from './model/encrypt-private-key-request';
-import { DecryptOAEPRequest } from './model/decrypt-oaeprequest';
-import { DecryptPKCS1v15Request } from './model/decrypt-pkcs1v15request';
-import { EncryptOAEPRequest } from './model/encrypt-oaeprequest';
-import { EncryptPKCS1v15Request } from './model/encrypt-pkcs1v15request';
-import { SignPSSRequest } from './model/sign-pssrequest';
-import { SignPKCS1v15Request } from './model/sign-pkcs1v15request';
-import { VerifyPSSRequest } from './model/verify-pssrequest';
-import { VerifyPKCS1v15Request } from './model/verify-pkcs1v15request';
+import { DecryptOAEPRequest } from './model/decrypt-o-a-e-p-request';
+import { DecryptPKCS1v15Request } from './model/decrypt-p-k-c-s1v15-request';
+import { EncryptOAEPRequest } from './model/encrypt-o-a-e-p-request';
+import { EncryptPKCS1v15Request } from './model/encrypt-p-k-c-s1v15-request';
+import { SignPSSRequest } from './model/sign-p-s-s-request';
+import { SignPKCS1v15Request } from './model/sign-p-k-c-s1v15-request';
+import { VerifyPSSRequest } from './model/verify-p-s-s-request';
+import { VerifyPKCS1v15Request } from './model/verify-p-k-c-s1v15-request';
 import { HashRequest } from './model/hash-request';
-import { Base64Request } from './model/base64request';
-import { PKCS12KeyPairResponse } from './model/pkcs12key-pair-response';
-import './shim'
+import { Base64Request } from './model/base64-request';
+import { PKCS12KeyPairResponse } from './model/p-k-c-s12-key-pair-response';
+import './shim';
 
 const FastRSANativeModules = (NativeModules as NativeModulesDef).FastRSA;
 

diff --git a/src/model/base64request.ts → src/model/base64-request.ts b/src/model/base64request.ts → src/model/base64-request.ts
diff --git a/src/model/convert-jwtrequest.ts → src/model/convert-j-w-t-request.ts b/src/model/convert-jwtrequest.ts → src/model/convert-j-w-t-request.ts
diff --git a/src/model/convert-pkcs12request.ts → src/model/convert-p-k-c-s12-request.ts b/src/model/convert-pkcs12request.ts → src/model/convert-p-k-c-s12-request.ts
diff --git a/src/model/decrypt-oaepbytes-request.ts → src/model/decrypt-o-a-e-p-bytes-request.ts b/src/model/decrypt-oaepbytes-request.ts → src/model/decrypt-o-a-e-p-bytes-request.ts
diff --git a/src/model/decrypt-oaeprequest.ts → src/model/decrypt-o-a-e-p-request.ts b/src/model/decrypt-oaeprequest.ts → src/model/decrypt-o-a-e-p-request.ts
diff --git a/src/model/decrypt-pkcs1v15bytes-request.ts → ...odel/decrypt-p-k-c-s1v15-bytes-request.ts b/src/model/decrypt-pkcs1v15bytes-request.ts → ...odel/decrypt-p-k-c-s1v15-bytes-request.ts
diff --git a/src/model/decrypt-pkcs1v15request.ts → src/model/decrypt-p-k-c-s1v15-request.ts b/src/model/decrypt-pkcs1v15request.ts → src/model/decrypt-p-k-c-s1v15-request.ts
diff --git a/src/model/encrypt-oaepbytes-request.ts → src/model/encrypt-o-a-e-p-bytes-request.ts b/src/model/encrypt-oaepbytes-request.ts → src/model/encrypt-o-a-e-p-bytes-request.ts
diff --git a/src/model/encrypt-oaeprequest.ts → src/model/encrypt-o-a-e-p-request.ts b/src/model/encrypt-oaeprequest.ts → src/model/encrypt-o-a-e-p-request.ts
diff --git a/src/model/encrypt-pkcs1v15bytes-request.ts → ...odel/encrypt-p-k-c-s1v15-bytes-request.ts b/src/model/encrypt-pkcs1v15bytes-request.ts → ...odel/encrypt-p-k-c-s1v15-bytes-request.ts
diff --git a/src/model/encrypt-pkcs1v15request.ts → src/model/encrypt-p-k-c-s1v15-request.ts b/src/model/encrypt-pkcs1v15request.ts → src/model/encrypt-p-k-c-s1v15-request.ts
diff --git a/src/model/encrypt-private-key-request.ts b/src/model/encrypt-private-key-request.ts
@@ -2,7 +2,7 @@
 
 import * as flatbuffers from 'flatbuffers';
 
-import { PEMCipher } from '../model/pemcipher';
+import { PEMCipher } from '../model/p-e-m-cipher';
 
 
 export class EncryptPrivateKeyRequest {

diff --git a/src/model/pemcipher.ts → src/model/p-e-m-cipher.ts b/src/model/pemcipher.ts → src/model/p-e-m-cipher.ts
diff --git a/src/model/pkcs12key-pair-response.ts → src/model/p-k-c-s12-key-pair-response.ts b/src/model/pkcs12key-pair-response.ts → src/model/p-k-c-s12-key-pair-response.ts
@@ -2,7 +2,7 @@
 
 import * as flatbuffers from 'flatbuffers';
 
-import { PKCS12KeyPair } from '../model/pkcs12key-pair';
+import { PKCS12KeyPair } from '../model/p-k-c-s12-key-pair';
 
 
 export class PKCS12KeyPairResponse {

diff --git a/src/model/pkcs12key-pair.ts → src/model/p-k-c-s12-key-pair.ts b/src/model/pkcs12key-pair.ts → src/model/p-k-c-s12-key-pair.ts
diff --git a/src/model/sign-pkcs1v15bytes-request.ts → src/model/sign-p-k-c-s1v15-bytes-request.ts b/src/model/sign-pkcs1v15bytes-request.ts → src/model/sign-p-k-c-s1v15-bytes-request.ts
diff --git a/src/model/sign-pkcs1v15request.ts → src/model/sign-p-k-c-s1v15-request.ts b/src/model/sign-pkcs1v15request.ts → src/model/sign-p-k-c-s1v15-request.ts
diff --git a/src/model/sign-pssbytes-request.ts → src/model/sign-p-s-s-bytes-request.ts b/src/model/sign-pssbytes-request.ts → src/model/sign-p-s-s-bytes-request.ts
diff --git a/src/model/sign-pssrequest.ts → src/model/sign-p-s-s-request.ts b/src/model/sign-pssrequest.ts → src/model/sign-p-s-s-request.ts
diff --git a/src/model/verify-pkcs1v15bytes-request.ts → ...model/verify-p-k-c-s1v15-bytes-request.ts b/src/model/verify-pkcs1v15bytes-request.ts → ...model/verify-p-k-c-s1v15-bytes-request.ts
diff --git a/src/model/verify-pkcs1v15request.ts → src/model/verify-p-k-c-s1v15-request.ts b/src/model/verify-pkcs1v15request.ts → src/model/verify-p-k-c-s1v15-request.ts
diff --git a/src/model/verify-pssbytes-request.ts → src/model/verify-p-s-s-bytes-request.ts b/src/model/verify-pssbytes-request.ts → src/model/verify-p-s-s-bytes-request.ts
diff --git a/src/model/verify-pssrequest.ts → src/model/verify-p-s-s-request.ts b/src/model/verify-pssrequest.ts → src/model/verify-p-s-s-request.ts