- identification_t supports now almost all id types
- x509 certificates work with identification_t now - fixes here, fixes there
This commit is contained in:
@@ -18,7 +18,6 @@
|
||||
#include <time.h>
|
||||
|
||||
#include "asn1.h"
|
||||
#include "oid.h"
|
||||
|
||||
#include <utils/logger_manager.h>
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <gmp.h>
|
||||
|
||||
#include <types.h>
|
||||
#include <asn1/oid.h>
|
||||
|
||||
|
||||
/* Defines some primitive ASN1 types */
|
||||
|
||||
+16
-13
@@ -172,23 +172,26 @@ const oid_t oid_names[] = {
|
||||
{ 0x03, 0, 0, "id-SHA-512" }, /* 159 */
|
||||
{ 0x86, 0, 1, "" }, /* 160 */
|
||||
{ 0xf8, 0, 1, "" }, /* 161 */
|
||||
{ 0x42, 171, 1, "netscape" }, /* 162 */
|
||||
{ 0x42, 174, 1, "netscape" }, /* 162 */
|
||||
{ 0x01, 169, 1, "" }, /* 163 */
|
||||
{ 0x01, 165, 0, "nsCertType" }, /* 164 */
|
||||
{ 0x03, 166, 0, "nsRevocationUrl" }, /* 165 */
|
||||
{ 0x04, 167, 0, "nsCaRevocationUrl" }, /* 166 */
|
||||
{ 0x08, 168, 0, "nsCaPolicyUrl" }, /* 167 */
|
||||
{ 0x0d, 0, 0, "nsComment" }, /* 168 */
|
||||
{ 0x04, 0, 1, "policy" }, /* 169 */
|
||||
{ 0x01, 0, 0, "nsSGC" }, /* 170 */
|
||||
{ 0x45, 0, 1, "verisign" }, /* 171 */
|
||||
{ 0x01, 0, 1, "pki" }, /* 172 */
|
||||
{ 0x09, 0, 1, "attributes" }, /* 173 */
|
||||
{ 0x02, 175, 0, "messageType" }, /* 174 */
|
||||
{ 0x03, 176, 0, "pkiStatus" }, /* 175 */
|
||||
{ 0x04, 177, 0, "failInfo" }, /* 176 */
|
||||
{ 0x05, 178, 0, "senderNonce" }, /* 177 */
|
||||
{ 0x06, 179, 0, "recipientNonce" }, /* 178 */
|
||||
{ 0x07, 180, 0, "transID" }, /* 179 */
|
||||
{ 0x08, 0, 0, "extensionReq" } /* 180 */
|
||||
{ 0x03, 172, 1, "directory" }, /* 169 */
|
||||
{ 0x01, 0, 1, "" }, /* 170 */
|
||||
{ 0x03, 0, 0, "employeeNumber" }, /* 171 */
|
||||
{ 0x04, 0, 1, "policy" }, /* 172 */
|
||||
{ 0x01, 0, 0, "nsSGC" }, /* 173 */
|
||||
{ 0x45, 0, 1, "verisign" }, /* 174 */
|
||||
{ 0x01, 0, 1, "pki" }, /* 175 */
|
||||
{ 0x09, 0, 1, "attributes" }, /* 176 */
|
||||
{ 0x02, 178, 0, "messageType" }, /* 177 */
|
||||
{ 0x03, 179, 0, "pkiStatus" }, /* 178 */
|
||||
{ 0x04, 180, 0, "failInfo" }, /* 179 */
|
||||
{ 0x05, 181, 0, "senderNonce" }, /* 180 */
|
||||
{ 0x06, 182, 0, "recipientNonce" }, /* 181 */
|
||||
{ 0x07, 183, 0, "transID" }, /* 182 */
|
||||
{ 0x08, 0, 0, "extensionReq" } /* 183 */
|
||||
};
|
||||
|
||||
+11
-6
@@ -5,6 +5,9 @@
|
||||
* Do not edit manually!
|
||||
*/
|
||||
|
||||
#ifndef OID_H_
|
||||
#define OID_H_
|
||||
|
||||
typedef struct {
|
||||
u_char octet;
|
||||
u_int next;
|
||||
@@ -67,9 +70,11 @@ extern const oid_t oid_names[];
|
||||
#define OID_NS_CA_REVOCATION_URL 166
|
||||
#define OID_NS_CA_POLICY_URL 167
|
||||
#define OID_NS_COMMENT 168
|
||||
#define OID_PKI_MESSAGE_TYPE 174
|
||||
#define OID_PKI_STATUS 175
|
||||
#define OID_PKI_FAIL_INFO 176
|
||||
#define OID_PKI_SENDER_NONCE 177
|
||||
#define OID_PKI_RECIPIENT_NONCE 178
|
||||
#define OID_PKI_TRANS_ID 179
|
||||
#define OID_PKI_MESSAGE_TYPE 177
|
||||
#define OID_PKI_STATUS 178
|
||||
#define OID_PKI_FAIL_INFO 179
|
||||
#define OID_PKI_SENDER_NONCE 180
|
||||
#define OID_PKI_RECIPIENT_NONCE 181
|
||||
#define OID_PKI_TRANS_ID 182
|
||||
|
||||
#endif /* OID_H_ */
|
||||
|
||||
@@ -30,6 +30,8 @@ print OID_H "/* Object identifiers (OIDs) used by FreeS/WAN\n",
|
||||
" * ", $automatic, "\n",
|
||||
" * ", $warning, "\n",
|
||||
" */\n\n",
|
||||
"#ifndef OID_H_\n",
|
||||
"#define OID_H_\n\n",
|
||||
"typedef struct {\n",
|
||||
" u_char octet;\n",
|
||||
" u_int next;\n",
|
||||
@@ -73,6 +75,8 @@ while ($line = <SRC>)
|
||||
$counter++;
|
||||
}
|
||||
|
||||
print OID_H "\n#endif /* OID_H_ */\n";
|
||||
|
||||
close SRC;
|
||||
close OID_H;
|
||||
|
||||
|
||||
@@ -167,6 +167,9 @@
|
||||
0x04 "nsCaRevocationUrl" OID_NS_CA_REVOCATION_URL
|
||||
0x08 "nsCaPolicyUrl" OID_NS_CA_POLICY_URL
|
||||
0x0d "nsComment" OID_NS_COMMENT
|
||||
0x03 "directory"
|
||||
0x01 ""
|
||||
0x03 "employeeNumber"
|
||||
0x04 "policy"
|
||||
0x01 "nsSGC"
|
||||
0x45 "verisign"
|
||||
|
||||
Reference in New Issue
Block a user