RDEV-777 Changes required to run the module on the centos
This commit is contained in:
KRI
parent
9feab3d94d
commit
58cba00be2
@ -2,11 +2,11 @@
|
||||
|
||||
gcc -fPIC -fno-stack-protector -c rublonPam.c src/pamApp.c src/coreHandler.c src/signatureWrapper.c lib/cfg_parse.c lib/cJSON.c lib/qrcodegen.c
|
||||
|
||||
sudo mkdir -p /lib/security
|
||||
sudo mkdir -p /lib64/security
|
||||
|
||||
sudo cp .config /lib/security
|
||||
sudo cp .config /lib64/security
|
||||
|
||||
sudo ld -x --shared -o /lib/security/rublonPam.so -lcurl rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o
|
||||
sudo ld -x --shared -o /lib64/security/rublonPam.so -lcurl rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o
|
||||
|
||||
rm rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o
|
||||
|
||||
|
||||
@ -127,7 +127,7 @@ static const int PENALTY_N4 = 10;
|
||||
// Public function - see documentation comment in header file.
|
||||
bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
|
||||
enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
|
||||
|
||||
size_t i;
|
||||
size_t textLen = strlen(text);
|
||||
if (textLen == 0)
|
||||
return qrcodegen_encodeSegmentsAdvanced(NULL, 0, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode);
|
||||
@ -145,7 +145,7 @@ bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode
|
||||
} else {
|
||||
if (textLen > bufLen)
|
||||
goto fail;
|
||||
for (size_t i = 0; i < textLen; i++)
|
||||
for (i = 0; i < textLen; i++)
|
||||
tempBuffer[i] = (uint8_t)text[i];
|
||||
seg.mode = qrcodegen_Mode_BYTE;
|
||||
seg.bitLength = calcSegmentBitLength(seg.mode, textLen);
|
||||
@ -182,8 +182,9 @@ bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcod
|
||||
// Appends the given number of low-order bits of the given value to the given byte-based
|
||||
// bit buffer, increasing the bit length. Requires 0 <= numBits <= 16 and val < 2^numBits.
|
||||
testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen) {
|
||||
int i;
|
||||
assert(0 <= numBits && numBits <= 16 && (unsigned long)val >> numBits == 0);
|
||||
for (int i = numBits - 1; i >= 0; i--, (*bitLen)++)
|
||||
for (i = numBits - 1; i >= 0; i--, (*bitLen)++)
|
||||
buffer[*bitLen >> 3] |= ((val >> i) & 1) << (7 - (*bitLen & 7));
|
||||
}
|
||||
|
||||
@ -202,6 +203,10 @@ bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
|
||||
// Public function - see documentation comment in header file.
|
||||
bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
|
||||
int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]) {
|
||||
|
||||
int i,j;
|
||||
uint8_t padByte;
|
||||
size_t k;
|
||||
assert(segs != NULL || len == 0);
|
||||
assert(qrcodegen_VERSION_MIN <= minVersion && minVersion <= maxVersion && maxVersion <= qrcodegen_VERSION_MAX);
|
||||
assert(0 <= (int)ecl && (int)ecl <= 3 && -1 <= (int)mask && (int)mask <= 7);
|
||||
@ -221,7 +226,7 @@ bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], siz
|
||||
assert(dataUsedBits != -1);
|
||||
|
||||
// Increase the error correction level while the data still fits in the current version number
|
||||
for (int i = (int)qrcodegen_Ecc_MEDIUM; i <= (int)qrcodegen_Ecc_HIGH; i++) { // From low to high
|
||||
for (i = (int)qrcodegen_Ecc_MEDIUM; i <= (int)qrcodegen_Ecc_HIGH; i++) { // From low to high
|
||||
if (boostEcl && dataUsedBits <= getNumDataCodewords(version, (enum qrcodegen_Ecc)i) * 8)
|
||||
ecl = (enum qrcodegen_Ecc)i;
|
||||
}
|
||||
@ -229,11 +234,11 @@ bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], siz
|
||||
// Concatenate all segments to create the data bit string
|
||||
memset(qrcode, 0, qrcodegen_BUFFER_LEN_FOR_VERSION(version) * sizeof(qrcode[0]));
|
||||
int bitLen = 0;
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
const struct qrcodegen_Segment *seg = &segs[i];
|
||||
for (k = 0; k < len; k++) {
|
||||
const struct qrcodegen_Segment *seg = &segs[k];
|
||||
appendBitsToBuffer((int)seg->mode, 4, qrcode, &bitLen);
|
||||
appendBitsToBuffer(seg->numChars, numCharCountBits(seg->mode, version), qrcode, &bitLen);
|
||||
for (int j = 0; j < seg->bitLength; j++)
|
||||
for (j = 0; j < seg->bitLength; j++)
|
||||
appendBitsToBuffer((seg->data[j >> 3] >> (7 - (j & 7))) & 1, 1, qrcode, &bitLen);
|
||||
}
|
||||
assert(bitLen == dataUsedBits);
|
||||
@ -249,7 +254,7 @@ bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], siz
|
||||
assert(bitLen % 8 == 0);
|
||||
|
||||
// Pad with alternating bytes until data capacity is reached
|
||||
for (uint8_t padByte = 0xEC; bitLen < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
|
||||
for (padByte = 0xEC; bitLen < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
|
||||
appendBitsToBuffer(padByte, 8, qrcode, &bitLen);
|
||||
|
||||
// Draw function and data codeword modules
|
||||
@ -262,7 +267,7 @@ bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], siz
|
||||
// Handle masking
|
||||
if (mask == qrcodegen_Mask_AUTO) { // Automatically choose best mask
|
||||
long minPenalty = LONG_MAX;
|
||||
for (int i = 0; i < 8; i++) {
|
||||
for (i = 0; i < 8; i++) {
|
||||
enum qrcodegen_Mask msk = (enum qrcodegen_Mask)i;
|
||||
applyMask(tempBuffer, qrcode, msk);
|
||||
drawFormatBits(ecl, msk, qrcode);
|
||||
@ -289,6 +294,7 @@ bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], siz
|
||||
// the input data. data[dataLen : rawCodewords] is used as a temporary work area and will
|
||||
// be clobbered by this function. The final answer is stored in result[0 : rawCodewords].
|
||||
testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]) {
|
||||
int i,j,k;
|
||||
// Calculate parameter numbers
|
||||
assert(0 <= (int)ecl && (int)ecl < 4 && qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
|
||||
int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[(int)ecl][version];
|
||||
@ -303,16 +309,16 @@ testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ec
|
||||
uint8_t generator[qrcodegen_REED_SOLOMON_DEGREE_MAX];
|
||||
calcReedSolomonGenerator(blockEccLen, generator);
|
||||
const uint8_t *dat = data;
|
||||
for (int i = 0; i < numBlocks; i++) {
|
||||
for (i = 0; i < numBlocks; i++) {
|
||||
int datLen = shortBlockDataLen + (i < numShortBlocks ? 0 : 1);
|
||||
uint8_t *ecc = &data[dataLen]; // Temporary storage
|
||||
calcReedSolomonRemainder(dat, datLen, generator, blockEccLen, ecc);
|
||||
for (int j = 0, k = i; j < datLen; j++, k += numBlocks) { // Copy data
|
||||
for (j = 0, k = i; j < datLen; j++, k += numBlocks) { // Copy data
|
||||
if (j == shortBlockDataLen)
|
||||
k -= numShortBlocks;
|
||||
result[k] = dat[j];
|
||||
}
|
||||
for (int j = 0, k = dataLen + i; j < blockEccLen; j++, k += numBlocks) // Copy ECC
|
||||
for (j = 0, k = dataLen + i; j < blockEccLen; j++, k += numBlocks) // Copy ECC
|
||||
result[k] = ecc[j];
|
||||
dat += datLen;
|
||||
}
|
||||
@ -351,6 +357,7 @@ testable int getNumRawDataModules(int ver) {
|
||||
|
||||
// Calculates the Reed-Solomon generator polynomial of the given degree, storing in result[0 : degree].
|
||||
testable void calcReedSolomonGenerator(int degree, uint8_t result[]) {
|
||||
int i,j;
|
||||
// Start with the monomial x^0
|
||||
assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
|
||||
memset(result, 0, degree * sizeof(result[0]));
|
||||
@ -360,9 +367,9 @@ testable void calcReedSolomonGenerator(int degree, uint8_t result[]) {
|
||||
// drop the highest term, and store the rest of the coefficients in order of descending powers.
|
||||
// Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D).
|
||||
uint8_t root = 1;
|
||||
for (int i = 0; i < degree; i++) {
|
||||
for (i = 0; i < degree; i++) {
|
||||
// Multiply the current product by (x - r^i)
|
||||
for (int j = 0; j < degree; j++) {
|
||||
for (j = 0; j < degree; j++) {
|
||||
result[j] = finiteFieldMultiply(result[j], root);
|
||||
if (j + 1 < degree)
|
||||
result[j] ^= result[j + 1];
|
||||
@ -376,15 +383,15 @@ testable void calcReedSolomonGenerator(int degree, uint8_t result[]) {
|
||||
// polynomials are in big endian and the generator has an implicit leading 1 term, storing the result in result[0 : degree].
|
||||
testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
|
||||
const uint8_t generator[], int degree, uint8_t result[]) {
|
||||
|
||||
int i,j;
|
||||
// Perform polynomial division
|
||||
assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
|
||||
memset(result, 0, degree * sizeof(result[0]));
|
||||
for (int i = 0; i < dataLen; i++) {
|
||||
for (i = 0; i < dataLen; i++) {
|
||||
uint8_t factor = data[i] ^ result[0];
|
||||
memmove(&result[0], &result[1], (degree - 1) * sizeof(result[0]));
|
||||
result[degree - 1] = 0;
|
||||
for (int j = 0; j < degree; j++)
|
||||
for (j = 0; j < degree; j++)
|
||||
result[j] ^= finiteFieldMultiply(generator[j], factor);
|
||||
}
|
||||
}
|
||||
@ -395,9 +402,10 @@ testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
|
||||
// Returns the product of the two given field elements modulo GF(2^8/0x11D).
|
||||
// All inputs are valid. This could be implemented as a 256*256 lookup table.
|
||||
testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y) {
|
||||
int i;
|
||||
// Russian peasant multiplication
|
||||
uint8_t z = 0;
|
||||
for (int i = 7; i >= 0; i--) {
|
||||
for (i = 7; i >= 0; i--) {
|
||||
z = (z << 1) ^ ((z >> 7) * 0x11D);
|
||||
z ^= ((y >> i) & 1) * x;
|
||||
}
|
||||
@ -411,6 +419,7 @@ testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y) {
|
||||
// Clears the given QR Code grid with white modules for the given
|
||||
// version's size, then marks every function module as black.
|
||||
testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
|
||||
int i,j;
|
||||
// Initialize QR Code
|
||||
int qrsize = version * 4 + 17;
|
||||
memset(qrcode, 0, ((qrsize * qrsize + 7) / 8 + 1) * sizeof(qrcode[0]));
|
||||
@ -428,8 +437,8 @@ testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
|
||||
// Fill numerous alignment patterns
|
||||
uint8_t alignPatPos[7];
|
||||
int numAlign = getAlignmentPatternPositions(version, alignPatPos);
|
||||
for (int i = 0; i < numAlign; i++) {
|
||||
for (int j = 0; j < numAlign; j++) {
|
||||
for (i = 0; i < numAlign; i++) {
|
||||
for (j = 0; j < numAlign; j++) {
|
||||
// Don't draw on the three finder corners
|
||||
if (!((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0)))
|
||||
fillRectangle(alignPatPos[i] - 2, alignPatPos[j] - 2, 5, 5, qrcode);
|
||||
@ -448,16 +457,17 @@ testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
|
||||
// non-function modules. This does not draw the format bits. This requires all function modules to be previously
|
||||
// marked black (namely by initializeFunctionModules()), because this may skip redrawing black function modules.
|
||||
static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
|
||||
int i,j,dx,dy;
|
||||
// Draw horizontal and vertical timing patterns
|
||||
int qrsize = qrcodegen_getSize(qrcode);
|
||||
for (int i = 7; i < qrsize - 7; i += 2) {
|
||||
for (i = 7; i < qrsize - 7; i += 2) {
|
||||
setModule(qrcode, 6, i, false);
|
||||
setModule(qrcode, i, 6, false);
|
||||
}
|
||||
|
||||
// Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules)
|
||||
for (int dy = -4; dy <= 4; dy++) {
|
||||
for (int dx = -4; dx <= 4; dx++) {
|
||||
for (dy = -4; dy <= 4; dy++) {
|
||||
for (dx = -4; dx <= 4; dx++) {
|
||||
int dist = abs(dx);
|
||||
if (abs(dy) > dist)
|
||||
dist = abs(dy);
|
||||
@ -472,12 +482,12 @@ static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
|
||||
// Draw numerous alignment patterns
|
||||
uint8_t alignPatPos[7];
|
||||
int numAlign = getAlignmentPatternPositions(version, alignPatPos);
|
||||
for (int i = 0; i < numAlign; i++) {
|
||||
for (int j = 0; j < numAlign; j++) {
|
||||
for (i = 0; i < numAlign; i++) {
|
||||
for (j = 0; j < numAlign; j++) {
|
||||
if ((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0))
|
||||
continue; // Don't draw on the three finder corners
|
||||
for (int dy = -1; dy <= 1; dy++) {
|
||||
for (int dx = -1; dx <= 1; dx++)
|
||||
for (dy = -1; dy <= 1; dy++) {
|
||||
for (dx = -1; dx <= 1; dx++)
|
||||
setModule(qrcode, alignPatPos[i] + dx, alignPatPos[j] + dy, dx == 0 && dy == 0);
|
||||
}
|
||||
}
|
||||
@ -487,14 +497,14 @@ static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
|
||||
if (version >= 7) {
|
||||
// Calculate error correction code and pack bits
|
||||
int rem = version; // version is uint6, in the range [7, 40]
|
||||
for (int i = 0; i < 12; i++)
|
||||
for (i = 0; i < 12; i++)
|
||||
rem = (rem << 1) ^ ((rem >> 11) * 0x1F25);
|
||||
long bits = (long)version << 12 | rem; // uint18
|
||||
assert(bits >> 18 == 0);
|
||||
|
||||
// Draw two copies
|
||||
for (int i = 0; i < 6; i++) {
|
||||
for (int j = 0; j < 3; j++) {
|
||||
for (i = 0; i < 6; i++) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
int k = qrsize - 11 + j;
|
||||
setModule(qrcode, k, i, (bits & 1) != 0);
|
||||
setModule(qrcode, i, k, (bits & 1) != 0);
|
||||
@ -509,30 +519,31 @@ static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
|
||||
// on the given mask and error correction level. This always draws all modules of
|
||||
// the format bits, unlike drawWhiteFunctionModules() which might skip black modules.
|
||||
static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]) {
|
||||
int i;
|
||||
// Calculate error correction code and pack bits
|
||||
assert(0 <= (int)mask && (int)mask <= 7);
|
||||
static const int table[] = {1, 0, 3, 2};
|
||||
int data = table[(int)ecl] << 3 | (int)mask; // errCorrLvl is uint2, mask is uint3
|
||||
int rem = data;
|
||||
for (int i = 0; i < 10; i++)
|
||||
for (i = 0; i < 10; i++)
|
||||
rem = (rem << 1) ^ ((rem >> 9) * 0x537);
|
||||
int bits = (data << 10 | rem) ^ 0x5412; // uint15
|
||||
assert(bits >> 15 == 0);
|
||||
|
||||
// Draw first copy
|
||||
for (int i = 0; i <= 5; i++)
|
||||
for (i = 0; i <= 5; i++)
|
||||
setModule(qrcode, 8, i, getBit(bits, i));
|
||||
setModule(qrcode, 8, 7, getBit(bits, 6));
|
||||
setModule(qrcode, 8, 8, getBit(bits, 7));
|
||||
setModule(qrcode, 7, 8, getBit(bits, 8));
|
||||
for (int i = 9; i < 15; i++)
|
||||
for (i = 9; i < 15; i++)
|
||||
setModule(qrcode, 14 - i, 8, getBit(bits, i));
|
||||
|
||||
// Draw second copy
|
||||
int qrsize = qrcodegen_getSize(qrcode);
|
||||
for (int i = 0; i < 8; i++)
|
||||
for (i = 0; i < 8; i++)
|
||||
setModule(qrcode, qrsize - 1 - i, 8, getBit(bits, i));
|
||||
for (int i = 8; i < 15; i++)
|
||||
for (i = 8; i < 15; i++)
|
||||
setModule(qrcode, 8, qrsize - 15 + i, getBit(bits, i));
|
||||
setModule(qrcode, 8, qrsize - 8, true); // Always black
|
||||
}
|
||||
@ -543,12 +554,13 @@ static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uin
|
||||
// Each position is in the range [0,177), and are used on both the x and y axes.
|
||||
// This could be implemented as lookup table of 40 variable-length lists of unsigned bytes.
|
||||
testable int getAlignmentPatternPositions(int version, uint8_t result[7]) {
|
||||
int i, pos;
|
||||
if (version == 1)
|
||||
return 0;
|
||||
int numAlign = version / 7 + 2;
|
||||
int step = (version == 32) ? 26 :
|
||||
(version*4 + numAlign*2 + 1) / (numAlign*2 - 2) * 2;
|
||||
for (int i = numAlign - 1, pos = version * 4 + 10; i >= 1; i--, pos -= step)
|
||||
for (i = numAlign - 1, pos = version * 4 + 10; i >= 1; i--, pos -= step)
|
||||
result[i] = pos;
|
||||
result[0] = 6;
|
||||
return numAlign;
|
||||
@ -557,8 +569,9 @@ testable int getAlignmentPatternPositions(int version, uint8_t result[7]) {
|
||||
|
||||
// Sets every pixel in the range [left : left + width] * [top : top + height] to black.
|
||||
static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]) {
|
||||
for (int dy = 0; dy < height; dy++) {
|
||||
for (int dx = 0; dx < width; dx++)
|
||||
int dx,dy;
|
||||
for (dy = 0; dy < height; dy++) {
|
||||
for (dx = 0; dx < width; dx++)
|
||||
setModule(qrcode, left + dx, top + dy, true);
|
||||
}
|
||||
}
|
||||
@ -570,14 +583,15 @@ static void fillRectangle(int left, int top, int width, int height, uint8_t qrco
|
||||
// Draws the raw codewords (including data and ECC) onto the given QR Code. This requires the initial state of
|
||||
// the QR Code to be black at function modules and white at codeword modules (including unused remainder bits).
|
||||
static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]) {
|
||||
int right,vert,j;
|
||||
int qrsize = qrcodegen_getSize(qrcode);
|
||||
int i = 0; // Bit index into the data
|
||||
// Do the funny zigzag scan
|
||||
for (int right = qrsize - 1; right >= 1; right -= 2) { // Index of right column in each column pair
|
||||
for (right = qrsize - 1; right >= 1; right -= 2) { // Index of right column in each column pair
|
||||
if (right == 6)
|
||||
right = 5;
|
||||
for (int vert = 0; vert < qrsize; vert++) { // Vertical counter
|
||||
for (int j = 0; j < 2; j++) {
|
||||
for (vert = 0; vert < qrsize; vert++) { // Vertical counter
|
||||
for (j = 0; j < 2; j++) {
|
||||
int x = right - j; // Actual x coordinate
|
||||
bool upward = ((right + 1) & 2) == 0;
|
||||
int y = upward ? qrsize - 1 - vert : vert; // Actual y coordinate
|
||||
@ -601,10 +615,11 @@ static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]) {
|
||||
// the same mask value a second time will undo the mask. A final well-formed
|
||||
// QR Code needs exactly one (not zero, two, etc.) mask applied.
|
||||
static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask) {
|
||||
int x,y;
|
||||
assert(0 <= (int)mask && (int)mask <= 7); // Disallows qrcodegen_Mask_AUTO
|
||||
int qrsize = qrcodegen_getSize(qrcode);
|
||||
for (int y = 0; y < qrsize; y++) {
|
||||
for (int x = 0; x < qrsize; x++) {
|
||||
for (y = 0; y < qrsize; y++) {
|
||||
for (x = 0; x < qrsize; x++) {
|
||||
if (getModule(functionModules, x, y))
|
||||
continue;
|
||||
bool invert;
|
||||
@ -631,13 +646,13 @@ static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qr
|
||||
static long getPenaltyScore(const uint8_t qrcode[]) {
|
||||
int qrsize = qrcodegen_getSize(qrcode);
|
||||
long result = 0;
|
||||
|
||||
int x,y;
|
||||
// Adjacent modules in row having same color, and finder-like patterns
|
||||
for (int y = 0; y < qrsize; y++) {
|
||||
for (y = 0; y < qrsize; y++) {
|
||||
unsigned char runHistory[7] = {0};
|
||||
bool color = false;
|
||||
unsigned char runX = 0;
|
||||
for (int x = 0; x < qrsize; x++) {
|
||||
for (x = 0; x < qrsize; x++) {
|
||||
if (getModule(qrcode, x, y) == color) {
|
||||
runX++;
|
||||
if (runX == 5)
|
||||
@ -659,11 +674,11 @@ static long getPenaltyScore(const uint8_t qrcode[]) {
|
||||
result += PENALTY_N3;
|
||||
}
|
||||
// Adjacent modules in column having same color, and finder-like patterns
|
||||
for (int x = 0; x < qrsize; x++) {
|
||||
for (x = 0; x < qrsize; x++) {
|
||||
unsigned char runHistory[7] = {0};
|
||||
bool color = false;
|
||||
unsigned char runY = 0;
|
||||
for (int y = 0; y < qrsize; y++) {
|
||||
for (y = 0; y < qrsize; y++) {
|
||||
if (getModule(qrcode, x, y) == color) {
|
||||
runY++;
|
||||
if (runY == 5)
|
||||
@ -686,8 +701,8 @@ static long getPenaltyScore(const uint8_t qrcode[]) {
|
||||
}
|
||||
|
||||
// 2*2 blocks of modules having same color
|
||||
for (int y = 0; y < qrsize - 1; y++) {
|
||||
for (int x = 0; x < qrsize - 1; x++) {
|
||||
for (y = 0; y < qrsize - 1; y++) {
|
||||
for (x = 0; x < qrsize - 1; x++) {
|
||||
bool color = getModule(qrcode, x, y);
|
||||
if ( color == getModule(qrcode, x + 1, y) &&
|
||||
color == getModule(qrcode, x, y + 1) &&
|
||||
@ -698,8 +713,8 @@ static long getPenaltyScore(const uint8_t qrcode[]) {
|
||||
|
||||
// Balance of black and white modules
|
||||
int black = 0;
|
||||
for (int y = 0; y < qrsize; y++) {
|
||||
for (int x = 0; x < qrsize; x++) {
|
||||
for (y = 0; y < qrsize; y++) {
|
||||
for (x = 0; x < qrsize; x++) {
|
||||
if (getModule(qrcode, x, y))
|
||||
black++;
|
||||
}
|
||||
@ -973,9 +988,10 @@ struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) {
|
||||
// Returns a non-negative number if successful. Otherwise returns -1 if a segment has too
|
||||
// many characters to fit its length field, or the total bits exceeds INT16_MAX.
|
||||
testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version) {
|
||||
size_t i;
|
||||
assert(segs != NULL || len == 0);
|
||||
long result = 0;
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
for (i = 0; i < len; i++) {
|
||||
int numChars = segs[i].numChars;
|
||||
int bitLength = segs[i].bitLength;
|
||||
assert(0 <= numChars && numChars <= INT16_MAX);
|
||||
|
||||
@ -61,9 +61,10 @@ void printQr(const uint8_t qrcode[],pam_handle_t *pamh) {
|
||||
char *qrCodeString = "";
|
||||
int size = qrcodegen_getSize(qrcode);
|
||||
int border = 1;
|
||||
|
||||
for(int y = -border; y < size + border; y++) {
|
||||
for(int x = -border; x < size + border; x++)
|
||||
int y;
|
||||
for(y = -border; y < size + border; y++) {
|
||||
int x;
|
||||
for(x = -border; x < size + border; x++)
|
||||
asprintf(&qrCodeString,"%s%s",qrCodeString,qrcodegen_getModule(qrcode, x, y) ? " " : "\033[47m \033[0m");
|
||||
asprintf(&qrCodeString,"%s%s",qrCodeString,"\n");
|
||||
}
|
||||
@ -83,7 +84,8 @@ void displayQrCode(pam_handle_t *pamh, char *qrToken) {
|
||||
|
||||
void displayAvailableAuthenticationMethods( cJSON *methods, char *transactionMethods, pam_handle_t *pamh) {
|
||||
if(cJSON_GetArraySize(methods)) {
|
||||
for (int i = 0; i < cJSON_GetArraySize(methods); i++) {
|
||||
int i;
|
||||
for (i = 0; i < cJSON_GetArraySize(methods); i++) {
|
||||
if (strcmp(cJSON_GetArrayItem(methods, i)->valuestring,"email") == 0)
|
||||
pam_prompt(pamh, PAM_TEXT_INFO, NULL, "%d: Email verification link",i+1);
|
||||
if (strcmp(cJSON_GetArrayItem(methods, i)->valuestring,"qrcode") == 0)
|
||||
@ -136,6 +138,12 @@ char *curlHandler(pam_handle_t *pamh, char *jsonObj, char *url, char *secretKey)
|
||||
char *xRublon;
|
||||
|
||||
asprintf(&xRublon,"X-Rublon-Signature: %s",signData(pamh,jsonObj, secretKey));
|
||||
|
||||
pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, NULL, "jsonObj %s",jsonObj);
|
||||
pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, NULL, "url %s",url);
|
||||
pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, NULL, "secretKey %s",secretKey);
|
||||
pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, NULL, "xRublon %s",xRublon);
|
||||
|
||||
if(curl) {
|
||||
struct curl_slist *chunk = NULL;
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url);
|
||||
@ -148,8 +156,9 @@ char *curlHandler(pam_handle_t *pamh, char *jsonObj, char *url, char *secretKey)
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunks);
|
||||
res = curl_easy_perform(curl);
|
||||
pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, NULL, "errors2 %s",curl_easy_strerror(res));
|
||||
if(res != CURLE_OK)
|
||||
return NULL;
|
||||
return NULL;
|
||||
long size;
|
||||
curl_easy_getinfo(curl, CURLINFO_HEADER_SIZE, &size);
|
||||
curlResponse = curlResponseJsonParser(pamh, size, chunks.memory);
|
||||
@ -188,14 +197,16 @@ bool checkResult(char *curlResponse) {
|
||||
}
|
||||
|
||||
bool isDigit(char *code) {
|
||||
for (int i=0;i<strlen(code); i++)
|
||||
int i;
|
||||
for (i=0;i<strlen(code); i++)
|
||||
if (!isdigit(code[i]))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool isOneOfSelectedMethods(char *selectedMethod, char *methods[], int methodsSize) {
|
||||
for (int i = 0; i < methodsSize; i++)
|
||||
int i;
|
||||
for (i = 0; i < methodsSize; i++)
|
||||
if (strcmp(selectedMethod,methods[i]) == 0)
|
||||
return true;
|
||||
return false;
|
||||
|
||||
@ -59,7 +59,7 @@ void* listenerThread(void* input) {
|
||||
char *getConfigValue(const char * value) {
|
||||
struct cfg_struct* cfg;
|
||||
cfg = cfg_init();
|
||||
if (cfg_load(cfg,"/lib/security/.config") < 0)
|
||||
if (cfg_load(cfg,"/lib64/security/.config") < 0)
|
||||
return NULL;
|
||||
else
|
||||
return (char*)cfg_get(cfg,value);
|
||||
|
||||
@ -50,9 +50,9 @@ char *curlResponseSignatureParser(pam_handle_t *pamh, long headerLength, char *r
|
||||
char *signData(pam_handle_t *pamh, char *data, char *secretKey) {
|
||||
unsigned char *hmac = HMAC(EVP_sha256(), (unsigned char*)secretKey, strlen(secretKey), (unsigned char*)data, strlen(data), NULL, NULL);
|
||||
char *xRublon = malloc (sizeof (char) * 64);
|
||||
|
||||
for(int i = 0; i < 32; i++)
|
||||
sprintf(&xRublon[i*2], "%02x", (unsigned int)hmac[i]);
|
||||
int i;
|
||||
for(i = 0; i < 32; i++)
|
||||
sprintf(&xRublon[i*2], "%02x", (unsigned int)hmac[i]);
|
||||
return xRublon;
|
||||
}
|
||||
|
||||
|
||||
21
Vagrantfile
vendored
21
Vagrantfile
vendored
@ -14,7 +14,8 @@ Vagrant.configure("2") do |config|
|
||||
|
||||
# Every Vagrant development environment requires a box. You can search for
|
||||
# boxes at https://vagrantcloud.com/search.
|
||||
config.vm.box = "ubuntu/bionic64"
|
||||
#config.vm.box = "ubuntu/bionic64"
|
||||
config.vm.box = "centos/7"
|
||||
|
||||
# Disable automatic box update checking. If you disable this, then
|
||||
# boxes will only be checked for updates when the user runs
|
||||
@ -66,11 +67,17 @@ Vagrant.configure("2") do |config|
|
||||
# Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
|
||||
# documentation for more information about their specific syntax and use.
|
||||
config.vm.provision "shell", inline: <<-SHELL
|
||||
apt-get update
|
||||
apt-get install -y openssh-server
|
||||
apt-get install -y libcurl4-openssl-dev
|
||||
apt-get install -y libpam0g-dev
|
||||
apt-get install -y libssl-dev
|
||||
|
||||
yum update
|
||||
yum install -y openssh-server
|
||||
yum install -y pam-devel
|
||||
yum install -y openssl-devel
|
||||
|
||||
# apt-get update
|
||||
# apt-get install -y openssh-server
|
||||
# apt-get install -y libcurl4-openssl-dev
|
||||
# apt-get install -y libpam0g-dev
|
||||
# apt-get install -y libssl-dev
|
||||
|
||||
sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config
|
||||
sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config
|
||||
@ -83,7 +90,7 @@ Vagrant.configure("2") do |config|
|
||||
|
||||
useradd -s /bin/bash -m kri
|
||||
echo "kri:kri"|chpasswd
|
||||
|
||||
|
||||
grep -q -e 'auth sufficient rublonPam.so' /etc/pam.d/sshd || sed -i '\$aauth sufficient rublonPam.so' /etc/pam.d/sshd
|
||||
grep -q -e 'account sufficient rublonPam.so' /etc/pam.d/sshd || sed -i '\$aaccount sufficient rublonPam.so' /etc/pam.d/sshd
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user