2
0

Enable annotation of library imports.

This commit is contained in:
Maarten Billemont 2020-01-23 16:03:40 -05:00
parent 0bbc6de2ab
commit a19df80a03
16 changed files with 70 additions and 32 deletions

View File

@ -37,9 +37,11 @@ NOTE: String length must be evenly divisible by 16byte (str_len % 16 == 0)
/*****************************************************************************/
/* Includes: */
/*****************************************************************************/
#include <string.h>
#include "aes.h"
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <string.h>
MP_LIBS_END
/*****************************************************************************/
/* Defines: */

View File

@ -9,7 +9,11 @@ This is an implementation of the AES algorithm, specifically ECB and CBC mode.
#ifndef _AES_H_
#define _AES_H_
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <stdint.h>
MP_LIBS_END
// #define the macros below to 1/0 to enable/disable the mode of operation.

View File

@ -54,8 +54,12 @@
* project, please see <http://www.apache.org/>.
*/
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <stddef.h>
#include <stdint.h>
MP_LIBS_END
/**
* @return The amount of bytes needed to decode the given b64Text.

View File

@ -16,12 +16,11 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
// NOTE: mpw is currently NOT thread-safe.
#include "mpw-types.h"
#ifndef _MPW_ALGORITHM_H
#define _MPW_ALGORITHM_H
#include "mpw-types.h"
typedef mpw_enum( unsigned int, MPAlgorithmVersion ) {
/** V0 did math with chars whose signedness was platform-dependent. */
MPAlgorithmVersion0,

View File

@ -16,12 +16,14 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#include "mpw-util.h"
#include "base64.h"
MP_LIBS_BEGIN
#include <string.h>
#include <errno.h>
#include <time.h>
#include "mpw-util.h"
#include "base64.h"
MP_LIBS_END
#define MP_N 32768LU
#define MP_r 8U

View File

@ -16,10 +16,12 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#include <string.h>
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <string.h>
MP_LIBS_END
#define MP_N 32768LU
#define MP_r 8U
#define MP_p 2U

View File

@ -16,11 +16,13 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <string.h>
#include <errno.h>
#include <time.h>
#include "mpw-util.h"
MP_LIBS_END
#define MP_N 32768LU
#define MP_r 8U

View File

@ -16,10 +16,12 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <string.h>
#include <errno.h>
#include "mpw-util.h"
MP_LIBS_END
#define MP_N 32768LU
#define MP_r 8U

View File

@ -16,11 +16,13 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#include <string.h>
#include "mpw-marshal-util.h"
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <string.h>
MP_LIBS_END
char *mpw_get_token(const char **in, const char *eol, char *delim) {
// Skip leading spaces.

View File

@ -19,12 +19,14 @@
#ifndef _MPW_MARSHAL_UTIL_H
#define _MPW_MARSHAL_UTIL_H
#include "mpw-algorithm.h"
MP_LIBS_BEGIN
#include <time.h>
#if MPW_JSON
#include "json-c/json.h"
#include <json-c/json.h>
#endif
#include "mpw-algorithm.h"
MP_LIBS_END
/// Type parsing.

View File

@ -17,14 +17,16 @@
//==============================================================================
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "mpw-marshal.h"
#include "mpw-util.h"
#include "mpw-marshal-util.h"
MP_LIBS_BEGIN
#include <stdio.h>
#include <string.h>
#include <ctype.h>
MP_LIBS_END
MPMarshalledUser *mpw_marshal_user(
const char *fullName, MPMasterKeyProvider masterKeyProvider, const MPAlgorithmVersion algorithmVersion) {

View File

@ -19,10 +19,12 @@
#ifndef _MPW_MARSHAL_H
#define _MPW_MARSHAL_H
#include <time.h>
#include "mpw-algorithm.h"
MP_LIBS_BEGIN
#include <time.h>
MP_LIBS_END
//// Types.
typedef mpw_enum( unsigned int, MPMarshalFormat ) {

View File

@ -16,12 +16,14 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#include <string.h>
#include <ctype.h>
#include "mpw-types.h"
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <string.h>
#include <ctype.h>
MP_LIBS_END
const size_t MPMasterKeySize = 64;
const size_t MPSiteKeySize = 256 / 8; // Size of HMAC-SHA-256
const MPIdenticon MPIdenticonUnset = {

View File

@ -19,9 +19,16 @@
#ifndef _MPW_TYPES_H
#define _MPW_TYPES_H
#ifndef MP_LIBS_BEGIN
#define MP_LIBS_BEGIN
#define MP_LIBS_END
#endif
MP_LIBS_BEGIN
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
MP_LIBS_END
#ifdef NS_ENUM
#define mpw_enum(_type, _name) NS_ENUM(_type, _name)

View File

@ -16,6 +16,9 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#include "mpw-util.h"
MP_LIBS_BEGIN
#include <string.h>
#include <ctype.h>
#include <errno.h>
@ -29,8 +32,7 @@
#define AES_ECB 0
#define AES_CBC 1
#include "aes.h"
#include "mpw-util.h"
MP_LIBS_END
#ifdef inf_level
int mpw_verbosity = inf_level;

View File

@ -19,10 +19,12 @@
#ifndef _MPW_UTIL_H
#define _MPW_UTIL_H
#include "mpw-types.h"
MP_LIBS_BEGIN
#include <stdio.h>
#include <stdarg.h>
#include "mpw-types.h"
MP_LIBS_END
//// Logging.
#ifndef trc