Skip to content

Commit f98e826

Browse files
rozdrozd
authored
Merge pull request #16 from airext/bugfix/hex
Bugfixes for HEX functions
2 parents a781208 + 3d9b2aa commit f98e826

File tree

18 files changed

+293
-96
lines changed

18 files changed

+293
-96
lines changed

‎build/build.xml

+4
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,8 @@
512512

513513
<target name="test.on.win">
514514

515+
<delete dir="test" />
516+
515517
<property name="tests.project.dir" value="../${project.name}-air/openssl-tests-flex" />
516518

517519
<fileset id="app.ane.anes" dir="${tests.project.dir}/ane">
@@ -559,9 +561,11 @@
559561
<path path="test" />
560562
</pathconvert>
561563

564+
<echo>Running test app</echo>
562565
<exec executable="powershell" dir="test">
563566
<arg line="Start-Process -FilePath OpenSSLTests/OpenSSLTestRunner.exe ${tests.working.dir}" />
564567
</exec>
568+
<echo>Run test app</echo>
565569

566570
<waitfor maxwait="5" maxwaitunit="minute">
567571
<or>

‎openssl-air/openssl-tests-flex/src/Main.mxml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<flexUnitUIRunner:TestRunnerBase id="uiListener" width="100%" height="100%" testsComplete="handleTestsComplete()" />
4545

4646
<s:HGroup padding="6" horizontalAlign="right" width="100%">
47-
<s:Label text="Extension version {OpenSSL.extensionVersion}" />
47+
<s:Label text="Extension version {OpenSSL.extensionVersion} {OpenSSL.buildNumber}" />
4848
<s:Label text="Native version {OpenSSL.shared.getBuildVersion()}" />
4949
<s:Label text="OpenSSL version {OpenSSL.nativeVersion}" />
5050
<s:Spacer width="100%" />

‎openssl-air/openssl-tests-flex/src/com/github/airext/openssl/test/helper/ByteArrayGenerator.as

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class ByteArrayGenerator {
1818
public static function generate(length: int): ByteArray {
1919
var bytes: ByteArray = new ByteArray();
2020
while (length--) {
21-
bytes.writeByte(Math.random() * 0xFF);
21+
bytes.writeByte(0x20 + Math.random() * (0x7E - 0x20));
2222
}
2323
bytes.position = 0;
2424
return bytes;

‎openssl-air/openssl-tests-flex/src/com/github/airext/openssl/test/suite/hex/theory/TheoryBytesHEX.as

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ public class TheoryBytesHEX {
1717

1818
[DataPoints]
1919
[ArrayElementType("flash.utils.ByteArray")]
20-
public static var data: Array = ByteArrayGenerator.generateMany(Variants.generatingDataCount, 32, 2048);
20+
public static var data: Array = ByteArrayGenerator.generateMany(Variants.generatingDataCount, 256, 2048);
2121

2222
[Theory]
2323
public function run(input: ByteArray): void {
2424
var encoded: String = OpenSSL.shared.hexFromBytes(input);
2525
var decoded: ByteArray = OpenSSL.shared.hexToBytes(encoded);
2626

27+
input.position = 0;
28+
decoded.position = 0;
29+
2730
assertEquals(input.readUTFBytes(input.length), decoded.readUTFBytes(decoded.length));
2831
}
2932
}

‎openssl-air/openssl/src/default/com/github/airext/OpenSSL.as

+9
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ public class OpenSSL extends EventDispatcher {
4848
return null;
4949
}
5050

51+
//-------------------------------------
52+
// buildNumber
53+
//-------------------------------------
54+
55+
public static function get buildNumber(): String {
56+
trace("OpenSSL is not supported on " + Capabilities.os);
57+
return null;
58+
}
59+
5160
//-------------------------------------
5261
// nativeVersion
5362
//-------------------------------------

‎openssl-air/openssl/src/main/com/github/airext/OpenSSL.as

+29
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,35 @@ public class OpenSSL extends EventDispatcher {
102102
return _extensionVersion;
103103
}
104104

105+
//-------------------------------------
106+
// buildNumber
107+
//-------------------------------------
108+
109+
private static var _buildNumber: String;
110+
111+
public static function get buildNumber(): String {
112+
if (_buildNumber == null) {
113+
try {
114+
var extension_xml: File = ExtensionContext.getExtensionDirectory(EXTENSION_ID).resolvePath("META-INF/ANE/extension.xml");
115+
if (extension_xml.exists) {
116+
var stream: FileStream = new FileStream();
117+
stream.open(extension_xml, FileMode.READ);
118+
119+
var extension: XML = new XML(stream.readUTFBytes(stream.bytesAvailable));
120+
stream.close();
121+
122+
var ns:Namespace = extension.namespace();
123+
124+
_buildNumber = extension.ns::description;
125+
}
126+
} catch (error:Error) {
127+
// ignore
128+
}
129+
}
130+
131+
return _buildNumber;
132+
}
133+
105134
//-------------------------------------
106135
// nativeVersion
107136
//-------------------------------------

‎openssl-win/openssl-win.xcodeproj/project.pbxproj

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
509BED74241154FA00F77731 /* airext_hex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509BED72241154FA00F77731 /* airext_hex.cpp */; };
1011
50A3AF9023D341FD0000ADB3 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50A3AF8F23D341FD0000ADB3 /* main.cpp */; };
1112
50A3AFA423D344310000ADB3 /* ANXOpenSSL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50A3AFA223D344300000ADB3 /* ANXOpenSSL.cpp */; };
1213
50A3AFA823D345050000ADB3 /* ANXOpenSSLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50A3AFA623D345050000ADB3 /* ANXOpenSSLUtils.cpp */; };
@@ -36,6 +37,8 @@
3637

3738
/* Begin PBXFileReference section */
3839
1A261B7C681F1946B3605FFE /* Pods_openssl_win_debug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_openssl_win_debug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
40+
509BED72241154FA00F77731 /* airext_hex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = airext_hex.cpp; path = "openssl-win/airext_hex.cpp"; sourceTree = "<group>"; };
41+
509BED73241154FA00F77731 /* airext_hex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = airext_hex.h; path = "openssl-win/airext_hex.h"; sourceTree = "<group>"; };
3942
50A3AF8C23D341FD0000ADB3 /* openssl-win-debug */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "openssl-win-debug"; sourceTree = BUILT_PRODUCTS_DIR; };
4043
50A3AF8F23D341FD0000ADB3 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
4144
50A3AFA123D3440D0000ADB3 /* FlashRuntimeExtensions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FlashRuntimeExtensions.h; path = "openssl-win/FlashRuntimeExtensions.h"; sourceTree = "<group>"; };
@@ -108,6 +111,8 @@
108111
50A3AFA023D343FD0000ADB3 /* Windows Files */ = {
109112
isa = PBXGroup;
110113
children = (
114+
509BED72241154FA00F77731 /* airext_hex.cpp */,
115+
509BED73241154FA00F77731 /* airext_hex.h */,
111116
50A3AFA123D3440D0000ADB3 /* FlashRuntimeExtensions.h */,
112117
50A3AFA223D344300000ADB3 /* ANXOpenSSL.cpp */,
113118
50A3AFA323D344310000ADB3 /* ANXOpenSSL.h */,
@@ -243,6 +248,7 @@
243248
50AE174F23D4AF2B0096E9C1 /* ANXOpenSSLSHA.cpp in Sources */,
244249
50A3AFB223D345E20000ADB3 /* ANXOpenSSLConversionRoutines.cpp in Sources */,
245250
50A3AF9023D341FD0000ADB3 /* main.cpp in Sources */,
251+
509BED74241154FA00F77731 /* airext_hex.cpp in Sources */,
246252
50A3AFB323D345E20000ADB3 /* ANXOpenSSLAES.cpp in Sources */,
247253
50AE175D23D78E270096E9C1 /* ANXOpenSSLHMAC.cpp in Sources */,
248254
50A3AFB523D345E20000ADB3 /* ANXOpenSSLBase64.cpp in Sources */,

‎openssl-win/openssl-win/ANXOpenSSL.cpp

+22-38
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@ unsigned char* ANXOpenSSL::sha256FromBytes(const unsigned char* input, uint32_t
218218
*outputLength = md_len * 2;
219219

220220
char* buffer = (char *)malloc(sizeof(char) * (*outputLength) + 1);
221+
if (!buffer) {
222+
return NULL;
223+
}
221224

222225
int offset = 0;
223226
for (int i = 0; i < md_len; i++) {
@@ -285,32 +288,17 @@ unsigned char* ANXOpenSSL::hmacFromBytes(const unsigned char *bytes, int bytesLe
285288
#pragma region HEX
286289

287290
unsigned char* ANXOpenSSL::hexEncodeString(const unsigned char* input, uint32_t inputLength, uint32_t* outputLength) {
288-
_OutputDebugString(L"[ANX] input: %s with length: %i", input, inputLength);
291+
_OutputDebugString(L"[ANX] input with length: %i", inputLength);
289292

290-
*outputLength = inputLength * 2;
293+
BIGNUM* bn = BN_bin2bn(input, inputLength, NULL);
291294

292-
char* buffer = (char*)malloc(sizeof(char) * (*outputLength) + 1);
293-
294-
int offset = 0;
295-
for (int i = 0; i < inputLength; i++) {
296-
#ifdef __APPLE__
297-
int count = sprintf(buffer + offset, "%02x", input[i]);
298-
#elif defined(_WIN32) || defined(_WIN64)
299-
int count = sprintf_s(buffer + offset, *outputLength, "%02x", input[i]);
300-
#endif
301-
if (count == -1) {
302-
_OutputDebugString(L"[ANX] EOF received, return NULL");
303-
free(buffer);
304-
return NULL;
305-
}
306-
offset += count;
307-
}
295+
char* output = BN_bn2hex(bn);
308296

309-
buffer[*outputLength] = '\0';
297+
*outputLength = (uint32_t)strlen(output);
310298

311-
_OutputDebugString(L"[ANX] output: %s with length: %i", buffer, *outputLength);
299+
BN_free(bn);
312300

313-
return (unsigned char*)buffer;
301+
return (unsigned char*)output;
314302
}
315303

316304
unsigned char* ANXOpenSSL::hexDecodeString(const unsigned char* input, uint32_t inputLength, uint32_t* outputLength) {
@@ -321,26 +309,22 @@ unsigned char* ANXOpenSSL::hexDecodeString(const unsigned char* input, uint32_t
321309
return NULL;
322310
}
323311

324-
char* string = (char*)input;
325-
326-
*outputLength = inputLength / 2;
327-
char* output = (char*)malloc(sizeof(char) * (*outputLength));
312+
BIGNUM* bn = BN_new();
328313

329-
for (int i = 0; i < *outputLength; i++) {
330-
#ifdef __APPLE__
331-
int result = sscanf(string, "%2hhx", &output[i]);
332-
#elif defined(_WIN32) || defined(_WIN64)
333-
int result = sscanf_s(string, "%2hhx", &output[i]);
334-
#endif
335-
if (result == -1) {
336-
_OutputDebugString(L"[ANX] EOF received, return NULL");
337-
free(output);
338-
return NULL;
339-
}
340-
string += 2;
314+
int input_length = BN_hex2bn(&bn, (const char*)input);
315+
if (input_length == 0) {
316+
return NULL;
341317
}
342318

343-
return (unsigned char*)output;
319+
unsigned int numOfBytes = BN_num_bytes(bn);
320+
321+
unsigned char* output = (unsigned char*)OPENSSL_malloc(numOfBytes);
322+
323+
*outputLength = BN_bn2bin(bn, output);
324+
325+
BN_free(bn);
326+
327+
return output;
344328
}
345329

346330
#pragma endregion

‎openssl-win/openssl-win/ANXOpenSSLBase64.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ FREObject ANXOpenSSLBase64::base64DecodeBytes(FREObject bytes)
144144

145145
_OutputDebugString(L"[ANX] Attempt to create output byte array");
146146

147-
FREObject result = ANXOpenSSLConversionRoutines::createByteArrayWithLength(outputLength);
147+
FREObject result = ANXOpenSSLConversionRoutines::createByteArrayWithLength((uint32_t)outputLength);
148148
if (result == NULL) {
149149
return NULL;
150150
}

‎openssl-win/openssl-win/ANXOpenSSLHEX.cpp

+10-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "ANXOpenSSLUtils.h"
1212
#include "ANXOpenSSLDefer.h"
1313
#include "ANXOpenSSLConversionRoutines.h"
14+
#include <openssl/crypto.h>
1415

1516
FREObject ANXOpenSSLHEX::hexEncodeString(FREObject string) {
1617
const unsigned char* input;
@@ -24,14 +25,14 @@ FREObject ANXOpenSSLHEX::hexEncodeString(FREObject string) {
2425
uint32_t outputLength;
2526
unsigned char* output = ANXOpenSSL::getInstance().hexEncodeString(input, inputLength, &outputLength);
2627

27-
_OutputDebugString(L"[ANX] Encoded: %s", output);
28-
2928
if (!output) {
3029
return NULL;
3130
}
3231

32+
_OutputDebugString(L"[ANX] Encoded: %s", output);
33+
3334
defer {
34-
free(output);
35+
OPENSSL_free(output);
3536
};
3637

3738
FREObject result;
@@ -59,7 +60,7 @@ FREObject ANXOpenSSLHEX::hexDecodeString(FREObject string) {
5960
}
6061

6162
defer {
62-
free(output);
63+
OPENSSL_free(output);
6364
};
6465

6566
FREObject result;
@@ -91,7 +92,7 @@ FREObject ANXOpenSSLHEX::hexEncodeBytes(FREObject bytes) {
9192
}
9293

9394
defer {
94-
free(output);
95+
OPENSSL_free(output);
9596
};
9697

9798
_OutputDebugString(L"[ANX] Attempt to release input byte array");
@@ -117,19 +118,19 @@ FREObject ANXOpenSSLHEX::hexDecodeBytes(FREObject bytes) {
117118
return NULL;
118119
}
119120

120-
_OutputDebugString(L"[ANX] Attempt to decode string: %s", input);
121+
_OutputDebugString(L"[ANX] Attempt to decode input string with length %i", inputLength);
121122

122123
uint32_t outputLength;
123124
unsigned char *decoded = ANXOpenSSL::getInstance().hexDecodeString(input, inputLength, &outputLength);
124125

125-
_OutputDebugString(L"[ANX] Decoded: %s", decoded);
126-
127126
if (!decoded) {
128127
return NULL;
129128
}
130129

130+
_OutputDebugString(L"[ANX] Decoded with length: %i", outputLength);
131+
131132
defer {
132-
free(decoded);
133+
OPENSSL_free(decoded);
133134
};
134135

135136
_OutputDebugString(L"[ANX] Attempt to create output byte array");

‎openssl-win/openssl-win/dllmain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ extern "C" {
210210
}
211211

212212
FREObject ANXOpenBuildVersion(FREContext context, void* functionData, uint32_t argc, FREObject argv[]) {
213-
return ANXOpenSSLConversionRoutines::convertCharArrayToFREObject("8");
213+
return ANXOpenSSLConversionRoutines::convertCharArrayToFREObject("27");
214214
}
215215

216216
#pragma endregion

‎openssl-xcode/OpenSSL/ANXOpenSSL/ANXOpenSSL.m

+6-32
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#import "ANXOpenSSL.h"
99
#import "ANXOpenSSLUtils.h"
10+
#import "airext_hex.h"
1011

1112
@implementation ANXOpenSSL
1213

@@ -284,51 +285,24 @@ - (unsigned char*)hmacForBytes:(nonnull const unsigned char*)bytes withLength:(i
284285
- (unsigned char*)hexEncodeString:(nonnull const unsigned char*)input inputLength:(uint32_t)inputLength outputLength:(uint32_t*)outputLength {
285286
NSLog(@"[ANX] input: %s", input);
286287

287-
*outputLength = inputLength * 2;
288-
289-
char* buffer = malloc(sizeof(char) * (*outputLength) + 1);
290-
291-
int offset = 0;
292-
for (int i = 0; i < inputLength; i++) {
293-
int count = sprintf(buffer + offset, "%02x", input[i]);
294-
if (count == -1) {
295-
NSLog(@"[ANX] EOF received, return NULL");
296-
free(buffer);
297-
return NULL;
298-
}
299-
offset += count;
300-
}
288+
char* output = airext_bin2hex(input, inputLength);
301289

302-
buffer[*outputLength] = '\0';
303-
304-
NSLog(@"[ANX] output: %s", buffer);
290+
*outputLength = inputLength * 2;
305291

306-
return (unsigned char*)buffer;
292+
return (unsigned char*)output;
307293
}
308294

309295
- (unsigned char*)hexDecodeString:(nonnull const unsigned char*)input inputLength:(uint32_t)inputLength outputLength:(uint32_t*)outputLength {
310-
311296
NSLog(@"[ANX] input: %s", input);
312297

313298
if (inputLength % 2 != 0) {
314299
NSLog(@"[ANX] input has odd length, return NULL");
315300
return NULL;
316301
}
317302

318-
char* string = (char*)input;
319-
320-
*outputLength = inputLength / 2;
321-
char* output = malloc(sizeof(char) * (*outputLength));
303+
unsigned char* output;
322304

323-
for (int i = 0; i < *outputLength; i++) {
324-
int result = sscanf(string, "%2hhx", &output[i]);
325-
if (result == -1) {
326-
NSLog(@"[ANX] EOF received, return NULL");
327-
free(output);
328-
return NULL;
329-
}
330-
string += 2;
331-
}
305+
*outputLength = (uint32_t)airext_hex2bin((char*)input, &output);
332306

333307
return (unsigned char*)output;
334308
}

0 commit comments

Comments
 (0)