Skip to content

Commit d130f47

Browse files
rlillbackrlillback
committed
Some minor cleanup
1 parent adb0bad commit d130f47

4 files changed

Lines changed: 315 additions & 79 deletions

File tree

‎agent.h‎

Lines changed: 4 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -42,71 +42,11 @@ extern ScheduledJob_t* currentJob; /* Defined in schedule.c */
4242
#endif
4343

4444
/* Versioning Information */
45-
/* 2.0.0.0 = Created wrapper class */
46-
/* 2.1.0.0 = Added TPM for raspberry pi into version */
47-
/* 2.5.0.0 = Added the following functionality: */
48-
/* * Log to file upon agent shutting down */
49-
/* * Agent runs through all jobs once, */
50-
/* this allows cron to schedule it */
51-
/* * Added warning log level */
52-
/* * Added a priority queue for agent jobs upon initial retrieval */
53-
/* * Ignore any chained jobs - inventory jobs will always */
54-
/* run immediate */
55-
/* * Check if a store is a directory before reading/writing */
56-
/* * Check if re-enrollment, inventory, or management jobs */
57-
/* are targeting the agent certificate & don't run those jobs. */
58-
/* * Added agent cert re-enrollment on Error response to reenroll */
59-
/* 2.5.1.0 = Added the following: */
60-
/* * Fixed a bug in openSSL cleanup causing segfaults */
61-
/* * Added a check to the inventory and management jobs to */
62-
/* validate cert store exists */
63-
/* * Added sanity checks on the initial configuration file */
64-
/* * Set default logging level to INFO */
65-
/* 2.5.2.0 = Fixed bugs in openSSL layer when performing management jobs */
66-
/* 2.6.0.0 = Modified Agent to work with Keyfactor Platform v8.5.2 */
67-
/* Includes fixes to wrapper layers for managing keypairs */
68-
/* 2.6.1.0 = Added -c switch to allow config file to be passed as a parameter */
69-
/* 2.7.0.0 = Added -h switch to use hostname_datetime for agent name */
70-
/* Added second registration hit for use with RegistrationHandler */
71-
/* 2.7.1.0 = Fixed bug with agent cert expiry */
72-
/* 2.7.2.0 = Fixed bug with HResult being returned instead of CodeString */
73-
/* 2.8.0.0 = Added the following: */
74-
/* * Updated licensing information */
75-
/* * Added Bootstrap certificate support via config file */
76-
/* 2.8.1.0 = Fixed logging to file bug */
77-
/* 2.8.2.0 = Fixed some memory leaks */
78-
/* 2.8.3.0 = Fixed more memory leak posibilities */
79-
/* 2.8.4.0 = Fixed re-registration issue where AgentId was not updated */
80-
/* 2.8.5.0 = Changed logging functionality */
81-
/* 2.8.6.0 = Minor bug fixes */
82-
/* 2.8.7.0 = Fixed Agent cert renewal issue for A0100007 and A0100008 codes */
83-
/* 2.8.8.0 = Agent now re-registers as new agent if its own certificate */
84-
/* has expired */
85-
/* 2.9.0.0 = Added custom client parameters stub to sessions. These params */
86-
/* get added to every hit of /Session/Register */
87-
/* 2.9.1.0 = Fixed issue where CSRs max length was too small for RSA/4096 */
88-
/* 2.9.2.0 = Fixed but in getting date time for agent's name */
89-
/* 2.10.0.0 = Fixed issue with openSSL management remove job */
90-
/* 2.11.0.0 = Allow agent to be made into a library */
91-
/* 2.12.0.0 = Update bootstrap certificate use case */
92-
/* 2.14.0.0 = Add command line switch to send X-ARR-ClientCert header to KF */
93-
/* 2.14.1.0 = Updated logging associated with v2.14.0.0 */
94-
/* 2.14.2.0 = Updated parameter processing & usage printing */
95-
/* 2.14.2.1 = Set up long options & cleaned usage output */
96-
/* 2.14.3.0 = Upgraded for EJBCA DN State Key & openssl v3.0 compatibility */
97-
/* 2.15.0.0 = Minor bug improvements */
98-
/* 2.15.1.0 = Updated for v12 API modifications */
99-
/* 2.15.2.0 = Updated DTO for Warning to allow agent rotation */
100-
/* 2.16.0.0 = Updated TPM for default passkey */
101-
/* 2.16.0.1 = Updated Makefile for OpenSSL v3.x */
102-
/* 2.16.1.0 = Modified agent to not send GUID capabilities. Compile bug fix */
103-
/* 2.17.0.0 = Modified agent to accept ECDSA as well as ECC for a keytype */
104-
/* 2.18.0.0 = Modified agent to skip using agent certificate & openssl fix */
105-
/* 2.19.0.0 = Modified agent to fix bug with writing agent certificate to file*/
106-
#define AGENT_MAJOR 2ULL
107-
#define AGENT_MINOR 19ULL
45+
/* 3.0.0.1 = Release candidate for agent v3 */
46+
#define AGENT_MAJOR 3ULL
47+
#define AGENT_MINOR 0ULL
10848
#define AGENT_MICRO 0ULL
109-
#define AGENT_BUILD 0ULL
49+
#define AGENT_BUILD 1ULL
11050

11151
#define AGENT_VERSION \
11252
((AGENT_MAJOR << 48) | \

‎csr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ bool generate_keypair(const char *keyType, int keySize)
108108
/* @return - success : the CSR string minus the header and footer */
109109
/* failure : NULL */
110110
/* */
111-
char *generate_csr(const char *asciiSubject, size_t * csrLen, char **pMessage,
111+
char* generate_csr(const char *asciiSubject, size_t * csrLen, char **pMessage,
112112
enum AgentApiResultStatus *pStatus)
113113
{
114114
char *csrString = NULL;

0 commit comments

Comments
 (0)