[svn-upgrade] new version strongswan (4.5.0)

3 files changed, 275 insertions, 270 deletions

diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index 8f91a2e2b..1e5dec8a5 100644
--- a/src/libstrongswan/asn1/oid.c
+++ b/src/libstrongswan/asn1/oid.c
@@ -171,12 +171,12 @@ const oid_t oid_names[] = {
  {              0x02,       159, 0,  7, "ecdsa-with-SHA256"         }, /* 158 */
  {              0x03,       160, 0,  7, "ecdsa-with-SHA384"         }, /* 159 */
  {              0x04,         0, 0,  7, "ecdsa-with-SHA512"         }, /* 160 */
- {0x2B,                     307, 1,  0, ""                          }, /* 161 */
- {  0x06,                   221, 1,  1, "dod"                       }, /* 162 */
+ {0x2B,                     309, 1,  0, ""                          }, /* 161 */
+ {  0x06,                   223, 1,  1, "dod"                       }, /* 162 */
  {    0x01,                   0, 1,  2, "internet"                  }, /* 163 */
- {      0x04,               182, 1,  3, "private"                   }, /* 164 */
+ {      0x04,               183, 1,  3, "private"                   }, /* 164 */
  {        0x01,               0, 1,  4, "enterprise"                }, /* 165 */
- {          0x82,           175, 1,  5, ""                          }, /* 166 */
+ {          0x82,           176, 1,  5, ""                          }, /* 166 */
  {            0x37,           0, 1,  6, "Microsoft"                 }, /* 167 */
  {              0x0A,       172, 1,  7, ""                          }, /* 168 */
  {                0x03,       0, 1,  8, ""                          }, /* 169 */
@@ -184,184 +184,186 @@ const oid_t oid_names[] = {
  {                  0x04,     0, 0,  9, "msEncryptingFileSystem"    }, /* 171 */
  {              0x14,         0, 1,  7, "msEnrollmentInfrastructure"}, /* 172 */
  {                0x02,       0, 1,  8, "msCertificateTypeExtension"}, /* 173 */
- {                  0x02,     0, 0,  9, "msSmartcardLogon"          }, /* 174 */
- {          0x89,             0, 1,  5, ""                          }, /* 175 */
- {            0x31,           0, 1,  6, ""                          }, /* 176 */
- {              0x01,         0, 1,  7, ""                          }, /* 177 */
- {                0x01,       0, 1,  8, ""                          }, /* 178 */
- {                  0x02,     0, 1,  9, ""                          }, /* 179 */
- {                    0x02, 181, 0, 10, ""                          }, /* 180 */
- {                    0x4B,   0, 0, 10, "TCGID"                     }, /* 181 */
- {      0x05,                 0, 1,  3, "security"                  }, /* 182 */
- {        0x05,               0, 1,  4, "mechanisms"                }, /* 183 */
- {          0x07,             0, 1,  5, "id-pkix"                   }, /* 184 */
- {            0x01,         188, 1,  6, "id-pe"                     }, /* 185 */
- {              0x01,       187, 0,  7, "authorityInfoAccess"       }, /* 186 */
- {              0x07,         0, 0,  7, "ipAddrBlocks"              }, /* 187 */
- {            0x02,         191, 1,  6, "id-qt"                     }, /* 188 */
- {              0x01,       190, 0,  7, "cps"                       }, /* 189 */
- {              0x02,         0, 0,  7, "unotice"                   }, /* 190 */
- {            0x03,         201, 1,  6, "id-kp"                     }, /* 191 */
- {              0x01,       193, 0,  7, "serverAuth"                }, /* 192 */
- {              0x02,       194, 0,  7, "clientAuth"                }, /* 193 */
- {              0x03,       195, 0,  7, "codeSigning"               }, /* 194 */
- {              0x04,       196, 0,  7, "emailProtection"           }, /* 195 */
- {              0x05,       197, 0,  7, "ipsecEndSystem"            }, /* 196 */
- {              0x06,       198, 0,  7, "ipsecTunnel"               }, /* 197 */
- {              0x07,       199, 0,  7, "ipsecUser"                 }, /* 198 */
- {              0x08,       200, 0,  7, "timeStamping"              }, /* 199 */
- {              0x09,         0, 0,  7, "ocspSigning"               }, /* 200 */
- {            0x08,         203, 1,  6, "id-otherNames"             }, /* 201 */
- {              0x05,         0, 0,  7, "xmppAddr"                  }, /* 202 */
- {            0x0A,         208, 1,  6, "id-aca"                    }, /* 203 */
- {              0x01,       205, 0,  7, "authenticationInfo"        }, /* 204 */
- {              0x02,       206, 0,  7, "accessIdentity"            }, /* 205 */
- {              0x03,       207, 0,  7, "chargingIdentity"          }, /* 206 */
- {              0x04,         0, 0,  7, "group"                     }, /* 207 */
- {            0x0B,         209, 0,  6, "subjectInfoAccess"         }, /* 208 */
- {            0x30,           0, 1,  6, "id-ad"                     }, /* 209 */
- {              0x01,       218, 1,  7, "ocsp"                      }, /* 210 */
- {                0x01,     212, 0,  8, "basic"                     }, /* 211 */
- {                0x02,     213, 0,  8, "nonce"                     }, /* 212 */
- {                0x03,     214, 0,  8, "crl"                       }, /* 213 */
- {                0x04,     215, 0,  8, "response"                  }, /* 214 */
- {                0x05,     216, 0,  8, "noCheck"                   }, /* 215 */
- {                0x06,     217, 0,  8, "archiveCutoff"             }, /* 216 */
- {                0x07,       0, 0,  8, "serviceLocator"            }, /* 217 */
- {              0x02,       219, 0,  7, "caIssuers"                 }, /* 218 */
- {              0x03,       220, 0,  7, "timeStamping"              }, /* 219 */
- {              0x05,         0, 0,  7, "caRepository"              }, /* 220 */
- {  0x0E,                   227, 1,  1, "oiw"                       }, /* 221 */
- {    0x03,                   0, 1,  2, "secsig"                    }, /* 222 */
- {      0x02,                 0, 1,  3, "algorithms"                }, /* 223 */
- {        0x07,             225, 0,  4, "des-cbc"                   }, /* 224 */
- {        0x1A,             226, 0,  4, "sha-1"                     }, /* 225 */
- {        0x1D,               0, 0,  4, "sha-1WithRSASignature"     }, /* 226 */
- {  0x24,                   273, 1,  1, "TeleTrusT"                 }, /* 227 */
- {    0x03,                   0, 1,  2, "algorithm"                 }, /* 228 */
- {      0x03,                 0, 1,  3, "signatureAlgorithm"        }, /* 229 */
- {        0x01,             234, 1,  4, "rsaSignature"              }, /* 230 */
- {          0x02,           232, 0,  5, "rsaSigWithripemd160"       }, /* 231 */
- {          0x03,           233, 0,  5, "rsaSigWithripemd128"       }, /* 232 */
- {          0x04,             0, 0,  5, "rsaSigWithripemd256"       }, /* 233 */
- {        0x02,               0, 1,  4, "ecSign"                    }, /* 234 */
- {          0x01,           236, 0,  5, "ecSignWithsha1"            }, /* 235 */
- {          0x02,           237, 0,  5, "ecSignWithripemd160"       }, /* 236 */
- {          0x03,           238, 0,  5, "ecSignWithmd2"             }, /* 237 */
- {          0x04,           239, 0,  5, "ecSignWithmd5"             }, /* 238 */
- {          0x05,           256, 1,  5, "ttt-ecg"                   }, /* 239 */
- {            0x01,         244, 1,  6, "fieldType"                 }, /* 240 */
- {              0x01,         0, 1,  7, "characteristictwoField"    }, /* 241 */
- {                0x01,       0, 1,  8, "basisType"                 }, /* 242 */
- {                  0x01,     0, 0,  9, "ipBasis"                   }, /* 243 */
- {            0x02,         246, 1,  6, "keyType"                   }, /* 244 */
- {              0x01,         0, 0,  7, "ecgPublicKey"              }, /* 245 */
- {            0x03,         247, 0,  6, "curve"                     }, /* 246 */
- {            0x04,         254, 1,  6, "signatures"                }, /* 247 */
- {              0x01,       249, 0,  7, "ecgdsa-with-RIPEMD160"     }, /* 248 */
- {              0x02,       250, 0,  7, "ecgdsa-with-SHA1"          }, /* 249 */
- {              0x03,       251, 0,  7, "ecgdsa-with-SHA224"        }, /* 250 */
- {              0x04,       252, 0,  7, "ecgdsa-with-SHA256"        }, /* 251 */
- {              0x05,       253, 0,  7, "ecgdsa-with-SHA384"        }, /* 252 */
- {              0x06,         0, 0,  7, "ecgdsa-with-SHA512"        }, /* 253 */
- {            0x05,           0, 1,  6, "module"                    }, /* 254 */
- {              0x01,         0, 0,  7, "1"                         }, /* 255 */
- {          0x08,             0, 1,  5, "ecStdCurvesAndGeneration"  }, /* 256 */
- {            0x01,           0, 1,  6, "ellipticCurve"             }, /* 257 */
- {              0x01,         0, 1,  7, "versionOne"                }, /* 258 */
- {                0x01,     260, 0,  8, "brainpoolP160r1"           }, /* 259 */
- {                0x02,     261, 0,  8, "brainpoolP160t1"           }, /* 260 */
- {                0x03,     262, 0,  8, "brainpoolP192r1"           }, /* 261 */
- {                0x04,     263, 0,  8, "brainpoolP192t1"           }, /* 262 */
- {                0x05,     264, 0,  8, "brainpoolP224r1"           }, /* 263 */
- {                0x06,     265, 0,  8, "brainpoolP224t1"           }, /* 264 */
- {                0x07,     266, 0,  8, "brainpoolP256r1"           }, /* 265 */
- {                0x08,     267, 0,  8, "brainpoolP256t1"           }, /* 266 */
- {                0x09,     268, 0,  8, "brainpoolP320r1"           }, /* 267 */
- {                0x0A,     269, 0,  8, "brainpoolP320t1"           }, /* 268 */
- {                0x0B,     270, 0,  8, "brainpoolP384r1"           }, /* 269 */
- {                0x0C,     271, 0,  8, "brainpoolP384t1"           }, /* 270 */
- {                0x0D,     272, 0,  8, "brainpoolP512r1"           }, /* 271 */
- {                0x0E,       0, 0,  8, "brainpoolP512t1"           }, /* 272 */
- {  0x81,                     0, 1,  1, ""                          }, /* 273 */
- {    0x04,                   0, 1,  2, "Certicom"                  }, /* 274 */
- {      0x00,                 0, 1,  3, "curve"                     }, /* 275 */
- {        0x01,             277, 0,  4, "sect163k1"                 }, /* 276 */
- {        0x02,             278, 0,  4, "sect163r1"                 }, /* 277 */
- {        0x03,             279, 0,  4, "sect239k1"                 }, /* 278 */
- {        0x04,             280, 0,  4, "sect113r1"                 }, /* 279 */
- {        0x05,             281, 0,  4, "sect113r2"                 }, /* 280 */
- {        0x06,             282, 0,  4, "secp112r1"                 }, /* 281 */
- {        0x07,             283, 0,  4, "secp112r2"                 }, /* 282 */
- {        0x08,             284, 0,  4, "secp160r1"                 }, /* 283 */
- {        0x09,             285, 0,  4, "secp160k1"                 }, /* 284 */
- {        0x0A,             286, 0,  4, "secp256k1"                 }, /* 285 */
- {        0x0F,             287, 0,  4, "sect163r2"                 }, /* 286 */
- {        0x10,             288, 0,  4, "sect283k1"                 }, /* 287 */
- {        0x11,             289, 0,  4, "sect283r1"                 }, /* 288 */
- {        0x16,             290, 0,  4, "sect131r1"                 }, /* 289 */
- {        0x17,             291, 0,  4, "sect131r2"                 }, /* 290 */
- {        0x18,             292, 0,  4, "sect193r1"                 }, /* 291 */
- {        0x19,             293, 0,  4, "sect193r2"                 }, /* 292 */
- {        0x1A,             294, 0,  4, "sect233k1"                 }, /* 293 */
- {        0x1B,             295, 0,  4, "sect233r1"                 }, /* 294 */
- {        0x1C,             296, 0,  4, "secp128r1"                 }, /* 295 */
- {        0x1D,             297, 0,  4, "secp128r2"                 }, /* 296 */
- {        0x1E,             298, 0,  4, "secp160r2"                 }, /* 297 */
- {        0x1F,             299, 0,  4, "secp192k1"                 }, /* 298 */
- {        0x20,             300, 0,  4, "secp224k1"                 }, /* 299 */
- {        0x21,             301, 0,  4, "secp224r1"                 }, /* 300 */
- {        0x22,             302, 0,  4, "secp384r1"                 }, /* 301 */
- {        0x23,             303, 0,  4, "secp521r1"                 }, /* 302 */
- {        0x24,             304, 0,  4, "sect409k1"                 }, /* 303 */
- {        0x25,             305, 0,  4, "sect409r1"                 }, /* 304 */
- {        0x26,             306, 0,  4, "sect571k1"                 }, /* 305 */
- {        0x27,               0, 0,  4, "sect571r1"                 }, /* 306 */
- {0x60,                       0, 1,  0, ""                          }, /* 307 */
- {  0x86,                     0, 1,  1, ""                          }, /* 308 */
- {    0x48,                   0, 1,  2, ""                          }, /* 309 */
- {      0x01,                 0, 1,  3, "organization"              }, /* 310 */
- {        0x65,             329, 1,  4, "gov"                       }, /* 311 */
- {          0x03,             0, 1,  5, "csor"                      }, /* 312 */
- {            0x04,           0, 1,  6, "nistalgorithm"             }, /* 313 */
- {              0x01,       324, 1,  7, "aes"                       }, /* 314 */
- {                0x02,     316, 0,  8, "id-aes128-CBC"             }, /* 315 */
- {                0x06,     317, 0,  8, "id-aes128-GCM"             }, /* 316 */
- {                0x07,     318, 0,  8, "id-aes128-CCM"             }, /* 317 */
- {                0x16,     319, 0,  8, "id-aes192-CBC"             }, /* 318 */
- {                0x1A,     320, 0,  8, "id-aes192-GCM"             }, /* 319 */
- {                0x1B,     321, 0,  8, "id-aes192-CCM"             }, /* 320 */
- {                0x2A,     322, 0,  8, "id-aes256-CBC"             }, /* 321 */
- {                0x2E,     323, 0,  8, "id-aes256-GCM"             }, /* 322 */
- {                0x2F,       0, 0,  8, "id-aes256-CCM"             }, /* 323 */
- {              0x02,         0, 1,  7, "hashalgs"                  }, /* 324 */
- {                0x01,     326, 0,  8, "id-SHA-256"                }, /* 325 */
- {                0x02,     327, 0,  8, "id-SHA-384"                }, /* 326 */
- {                0x03,     328, 0,  8, "id-SHA-512"                }, /* 327 */
- {                0x04,       0, 0,  8, "id-SHA-224"                }, /* 328 */
- {        0x86,               0, 1,  4, ""                          }, /* 329 */
- {          0xf8,             0, 1,  5, ""                          }, /* 330 */
- {            0x42,         343, 1,  6, "netscape"                  }, /* 331 */
- {              0x01,       338, 1,  7, ""                          }, /* 332 */
- {                0x01,     334, 0,  8, "nsCertType"                }, /* 333 */
- {                0x03,     335, 0,  8, "nsRevocationUrl"           }, /* 334 */
- {                0x04,     336, 0,  8, "nsCaRevocationUrl"         }, /* 335 */
- {                0x08,     337, 0,  8, "nsCaPolicyUrl"             }, /* 336 */
- {                0x0d,       0, 0,  8, "nsComment"                 }, /* 337 */
- {              0x03,       341, 1,  7, "directory"                 }, /* 338 */
- {                0x01,       0, 1,  8, ""                          }, /* 339 */
- {                  0x03,     0, 0,  9, "employeeNumber"            }, /* 340 */
- {              0x04,         0, 1,  7, "policy"                    }, /* 341 */
- {                0x01,       0, 0,  8, "nsSGC"                     }, /* 342 */
- {            0x45,           0, 1,  6, "verisign"                  }, /* 343 */
- {              0x01,         0, 1,  7, "pki"                       }, /* 344 */
- {                0x09,       0, 1,  8, "attributes"                }, /* 345 */
- {                  0x02,   347, 0,  9, "messageType"               }, /* 346 */
- {                  0x03,   348, 0,  9, "pkiStatus"                 }, /* 347 */
- {                  0x04,   349, 0,  9, "failInfo"                  }, /* 348 */
- {                  0x05,   350, 0,  9, "senderNonce"               }, /* 349 */
- {                  0x06,   351, 0,  9, "recipientNonce"            }, /* 350 */
- {                  0x07,   352, 0,  9, "transID"                   }, /* 351 */
- {                  0x08,   353, 0,  9, "extensionReq"              }, /* 352 */
- {                  0x08,     0, 0,  9, "extensionReq"              }  /* 353 */
+ {                  0x02,   175, 0,  9, "msSmartcardLogon"          }, /* 174 */
+ {                  0x03,     0, 0,  9, "msUPN"                     }, /* 175 */
+ {          0x89,             0, 1,  5, ""                          }, /* 176 */
+ {            0x31,           0, 1,  6, ""                          }, /* 177 */
+ {              0x01,         0, 1,  7, ""                          }, /* 178 */
+ {                0x01,       0, 1,  8, ""                          }, /* 179 */
+ {                  0x02,     0, 1,  9, ""                          }, /* 180 */
+ {                    0x02, 182, 0, 10, ""                          }, /* 181 */
+ {                    0x4B,   0, 0, 10, "TCGID"                     }, /* 182 */
+ {      0x05,                 0, 1,  3, "security"                  }, /* 183 */
+ {        0x05,               0, 1,  4, "mechanisms"                }, /* 184 */
+ {          0x07,             0, 1,  5, "id-pkix"                   }, /* 185 */
+ {            0x01,         190, 1,  6, "id-pe"                     }, /* 186 */
+ {              0x01,       188, 0,  7, "authorityInfoAccess"       }, /* 187 */
+ {              0x03,       189, 0,  7, "qcStatements"              }, /* 188 */
+ {              0x07,         0, 0,  7, "ipAddrBlocks"              }, /* 189 */
+ {            0x02,         193, 1,  6, "id-qt"                     }, /* 190 */
+ {              0x01,       192, 0,  7, "cps"                       }, /* 191 */
+ {              0x02,         0, 0,  7, "unotice"                   }, /* 192 */
+ {            0x03,         203, 1,  6, "id-kp"                     }, /* 193 */
+ {              0x01,       195, 0,  7, "serverAuth"                }, /* 194 */
+ {              0x02,       196, 0,  7, "clientAuth"                }, /* 195 */
+ {              0x03,       197, 0,  7, "codeSigning"               }, /* 196 */
+ {              0x04,       198, 0,  7, "emailProtection"           }, /* 197 */
+ {              0x05,       199, 0,  7, "ipsecEndSystem"            }, /* 198 */
+ {              0x06,       200, 0,  7, "ipsecTunnel"               }, /* 199 */
+ {              0x07,       201, 0,  7, "ipsecUser"                 }, /* 200 */
+ {              0x08,       202, 0,  7, "timeStamping"              }, /* 201 */
+ {              0x09,         0, 0,  7, "ocspSigning"               }, /* 202 */
+ {            0x08,         205, 1,  6, "id-otherNames"             }, /* 203 */
+ {              0x05,         0, 0,  7, "xmppAddr"                  }, /* 204 */
+ {            0x0A,         210, 1,  6, "id-aca"                    }, /* 205 */
+ {              0x01,       207, 0,  7, "authenticationInfo"        }, /* 206 */
+ {              0x02,       208, 0,  7, "accessIdentity"            }, /* 207 */
+ {              0x03,       209, 0,  7, "chargingIdentity"          }, /* 208 */
+ {              0x04,         0, 0,  7, "group"                     }, /* 209 */
+ {            0x0B,         211, 0,  6, "subjectInfoAccess"         }, /* 210 */
+ {            0x30,           0, 1,  6, "id-ad"                     }, /* 211 */
+ {              0x01,       220, 1,  7, "ocsp"                      }, /* 212 */
+ {                0x01,     214, 0,  8, "basic"                     }, /* 213 */
+ {                0x02,     215, 0,  8, "nonce"                     }, /* 214 */
+ {                0x03,     216, 0,  8, "crl"                       }, /* 215 */
+ {                0x04,     217, 0,  8, "response"                  }, /* 216 */
+ {                0x05,     218, 0,  8, "noCheck"                   }, /* 217 */
+ {                0x06,     219, 0,  8, "archiveCutoff"             }, /* 218 */
+ {                0x07,       0, 0,  8, "serviceLocator"            }, /* 219 */
+ {              0x02,       221, 0,  7, "caIssuers"                 }, /* 220 */
+ {              0x03,       222, 0,  7, "timeStamping"              }, /* 221 */
+ {              0x05,         0, 0,  7, "caRepository"              }, /* 222 */
+ {  0x0E,                   229, 1,  1, "oiw"                       }, /* 223 */
+ {    0x03,                   0, 1,  2, "secsig"                    }, /* 224 */
+ {      0x02,                 0, 1,  3, "algorithms"                }, /* 225 */
+ {        0x07,             227, 0,  4, "des-cbc"                   }, /* 226 */
+ {        0x1A,             228, 0,  4, "sha-1"                     }, /* 227 */
+ {        0x1D,               0, 0,  4, "sha-1WithRSASignature"     }, /* 228 */
+ {  0x24,                   275, 1,  1, "TeleTrusT"                 }, /* 229 */
+ {    0x03,                   0, 1,  2, "algorithm"                 }, /* 230 */
+ {      0x03,                 0, 1,  3, "signatureAlgorithm"        }, /* 231 */
+ {        0x01,             236, 1,  4, "rsaSignature"              }, /* 232 */
+ {          0x02,           234, 0,  5, "rsaSigWithripemd160"       }, /* 233 */
+ {          0x03,           235, 0,  5, "rsaSigWithripemd128"       }, /* 234 */
+ {          0x04,             0, 0,  5, "rsaSigWithripemd256"       }, /* 235 */
+ {        0x02,               0, 1,  4, "ecSign"                    }, /* 236 */
+ {          0x01,           238, 0,  5, "ecSignWithsha1"            }, /* 237 */
+ {          0x02,           239, 0,  5, "ecSignWithripemd160"       }, /* 238 */
+ {          0x03,           240, 0,  5, "ecSignWithmd2"             }, /* 239 */
+ {          0x04,           241, 0,  5, "ecSignWithmd5"             }, /* 240 */
+ {          0x05,           258, 1,  5, "ttt-ecg"                   }, /* 241 */
+ {            0x01,         246, 1,  6, "fieldType"                 }, /* 242 */
+ {              0x01,         0, 1,  7, "characteristictwoField"    }, /* 243 */
+ {                0x01,       0, 1,  8, "basisType"                 }, /* 244 */
+ {                  0x01,     0, 0,  9, "ipBasis"                   }, /* 245 */
+ {            0x02,         248, 1,  6, "keyType"                   }, /* 246 */
+ {              0x01,         0, 0,  7, "ecgPublicKey"              }, /* 247 */
+ {            0x03,         249, 0,  6, "curve"                     }, /* 248 */
+ {            0x04,         256, 1,  6, "signatures"                }, /* 249 */
+ {              0x01,       251, 0,  7, "ecgdsa-with-RIPEMD160"     }, /* 250 */
+ {              0x02,       252, 0,  7, "ecgdsa-with-SHA1"          }, /* 251 */
+ {              0x03,       253, 0,  7, "ecgdsa-with-SHA224"        }, /* 252 */
+ {              0x04,       254, 0,  7, "ecgdsa-with-SHA256"        }, /* 253 */
+ {              0x05,       255, 0,  7, "ecgdsa-with-SHA384"        }, /* 254 */
+ {              0x06,         0, 0,  7, "ecgdsa-with-SHA512"        }, /* 255 */
+ {            0x05,           0, 1,  6, "module"                    }, /* 256 */
+ {              0x01,         0, 0,  7, "1"                         }, /* 257 */
+ {          0x08,             0, 1,  5, "ecStdCurvesAndGeneration"  }, /* 258 */
+ {            0x01,           0, 1,  6, "ellipticCurve"             }, /* 259 */
+ {              0x01,         0, 1,  7, "versionOne"                }, /* 260 */
+ {                0x01,     262, 0,  8, "brainpoolP160r1"           }, /* 261 */
+ {                0x02,     263, 0,  8, "brainpoolP160t1"           }, /* 262 */
+ {                0x03,     264, 0,  8, "brainpoolP192r1"           }, /* 263 */
+ {                0x04,     265, 0,  8, "brainpoolP192t1"           }, /* 264 */
+ {                0x05,     266, 0,  8, "brainpoolP224r1"           }, /* 265 */
+ {                0x06,     267, 0,  8, "brainpoolP224t1"           }, /* 266 */
+ {                0x07,     268, 0,  8, "brainpoolP256r1"           }, /* 267 */
+ {                0x08,     269, 0,  8, "brainpoolP256t1"           }, /* 268 */
+ {                0x09,     270, 0,  8, "brainpoolP320r1"           }, /* 269 */
+ {                0x0A,     271, 0,  8, "brainpoolP320t1"           }, /* 270 */
+ {                0x0B,     272, 0,  8, "brainpoolP384r1"           }, /* 271 */
+ {                0x0C,     273, 0,  8, "brainpoolP384t1"           }, /* 272 */
+ {                0x0D,     274, 0,  8, "brainpoolP512r1"           }, /* 273 */
+ {                0x0E,       0, 0,  8, "brainpoolP512t1"           }, /* 274 */
+ {  0x81,                     0, 1,  1, ""                          }, /* 275 */
+ {    0x04,                   0, 1,  2, "Certicom"                  }, /* 276 */
+ {      0x00,                 0, 1,  3, "curve"                     }, /* 277 */
+ {        0x01,             279, 0,  4, "sect163k1"                 }, /* 278 */
+ {        0x02,             280, 0,  4, "sect163r1"                 }, /* 279 */
+ {        0x03,             281, 0,  4, "sect239k1"                 }, /* 280 */
+ {        0x04,             282, 0,  4, "sect113r1"                 }, /* 281 */
+ {        0x05,             283, 0,  4, "sect113r2"                 }, /* 282 */
+ {        0x06,             284, 0,  4, "secp112r1"                 }, /* 283 */
+ {        0x07,             285, 0,  4, "secp112r2"                 }, /* 284 */
+ {        0x08,             286, 0,  4, "secp160r1"                 }, /* 285 */
+ {        0x09,             287, 0,  4, "secp160k1"                 }, /* 286 */
+ {        0x0A,             288, 0,  4, "secp256k1"                 }, /* 287 */
+ {        0x0F,             289, 0,  4, "sect163r2"                 }, /* 288 */
+ {        0x10,             290, 0,  4, "sect283k1"                 }, /* 289 */
+ {        0x11,             291, 0,  4, "sect283r1"                 }, /* 290 */
+ {        0x16,             292, 0,  4, "sect131r1"                 }, /* 291 */
+ {        0x17,             293, 0,  4, "sect131r2"                 }, /* 292 */
+ {        0x18,             294, 0,  4, "sect193r1"                 }, /* 293 */
+ {        0x19,             295, 0,  4, "sect193r2"                 }, /* 294 */
+ {        0x1A,             296, 0,  4, "sect233k1"                 }, /* 295 */
+ {        0x1B,             297, 0,  4, "sect233r1"                 }, /* 296 */
+ {        0x1C,             298, 0,  4, "secp128r1"                 }, /* 297 */
+ {        0x1D,             299, 0,  4, "secp128r2"                 }, /* 298 */
+ {        0x1E,             300, 0,  4, "secp160r2"                 }, /* 299 */
+ {        0x1F,             301, 0,  4, "secp192k1"                 }, /* 300 */
+ {        0x20,             302, 0,  4, "secp224k1"                 }, /* 301 */
+ {        0x21,             303, 0,  4, "secp224r1"                 }, /* 302 */
+ {        0x22,             304, 0,  4, "secp384r1"                 }, /* 303 */
+ {        0x23,             305, 0,  4, "secp521r1"                 }, /* 304 */
+ {        0x24,             306, 0,  4, "sect409k1"                 }, /* 305 */
+ {        0x25,             307, 0,  4, "sect409r1"                 }, /* 306 */
+ {        0x26,             308, 0,  4, "sect571k1"                 }, /* 307 */
+ {        0x27,               0, 0,  4, "sect571r1"                 }, /* 308 */
+ {0x60,                       0, 1,  0, ""                          }, /* 309 */
+ {  0x86,                     0, 1,  1, ""                          }, /* 310 */
+ {    0x48,                   0, 1,  2, ""                          }, /* 311 */
+ {      0x01,                 0, 1,  3, "organization"              }, /* 312 */
+ {        0x65,             331, 1,  4, "gov"                       }, /* 313 */
+ {          0x03,             0, 1,  5, "csor"                      }, /* 314 */
+ {            0x04,           0, 1,  6, "nistalgorithm"             }, /* 315 */
+ {              0x01,       326, 1,  7, "aes"                       }, /* 316 */
+ {                0x02,     318, 0,  8, "id-aes128-CBC"             }, /* 317 */
+ {                0x06,     319, 0,  8, "id-aes128-GCM"             }, /* 318 */
+ {                0x07,     320, 0,  8, "id-aes128-CCM"             }, /* 319 */
+ {                0x16,     321, 0,  8, "id-aes192-CBC"             }, /* 320 */
+ {                0x1A,     322, 0,  8, "id-aes192-GCM"             }, /* 321 */
+ {                0x1B,     323, 0,  8, "id-aes192-CCM"             }, /* 322 */
+ {                0x2A,     324, 0,  8, "id-aes256-CBC"             }, /* 323 */
+ {                0x2E,     325, 0,  8, "id-aes256-GCM"             }, /* 324 */
+ {                0x2F,       0, 0,  8, "id-aes256-CCM"             }, /* 325 */
+ {              0x02,         0, 1,  7, "hashalgs"                  }, /* 326 */
+ {                0x01,     328, 0,  8, "id-SHA-256"                }, /* 327 */
+ {                0x02,     329, 0,  8, "id-SHA-384"                }, /* 328 */
+ {                0x03,     330, 0,  8, "id-SHA-512"                }, /* 329 */
+ {                0x04,       0, 0,  8, "id-SHA-224"                }, /* 330 */
+ {        0x86,               0, 1,  4, ""                          }, /* 331 */
+ {          0xf8,             0, 1,  5, ""                          }, /* 332 */
+ {            0x42,         345, 1,  6, "netscape"                  }, /* 333 */
+ {              0x01,       340, 1,  7, ""                          }, /* 334 */
+ {                0x01,     336, 0,  8, "nsCertType"                }, /* 335 */
+ {                0x03,     337, 0,  8, "nsRevocationUrl"           }, /* 336 */
+ {                0x04,     338, 0,  8, "nsCaRevocationUrl"         }, /* 337 */
+ {                0x08,     339, 0,  8, "nsCaPolicyUrl"             }, /* 338 */
+ {                0x0d,       0, 0,  8, "nsComment"                 }, /* 339 */
+ {              0x03,       343, 1,  7, "directory"                 }, /* 340 */
+ {                0x01,       0, 1,  8, ""                          }, /* 341 */
+ {                  0x03,     0, 0,  9, "employeeNumber"            }, /* 342 */
+ {              0x04,         0, 1,  7, "policy"                    }, /* 343 */
+ {                0x01,       0, 0,  8, "nsSGC"                     }, /* 344 */
+ {            0x45,           0, 1,  6, "verisign"                  }, /* 345 */
+ {              0x01,         0, 1,  7, "pki"                       }, /* 346 */
+ {                0x09,       0, 1,  8, "attributes"                }, /* 347 */
+ {                  0x02,   349, 0,  9, "messageType"               }, /* 348 */
+ {                  0x03,   350, 0,  9, "pkiStatus"                 }, /* 349 */
+ {                  0x04,   351, 0,  9, "failInfo"                  }, /* 350 */
+ {                  0x05,   352, 0,  9, "senderNonce"               }, /* 351 */
+ {                  0x06,   353, 0,  9, "recipientNonce"            }, /* 352 */
+ {                  0x07,   354, 0,  9, "transID"                   }, /* 353 */
+ {                  0x08,   355, 0,  9, "extensionReq"              }, /* 354 */
+ {                  0x08,     0, 0,  9, "extensionReq"              }  /* 355 */
 };
diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h
index aa1fd31b0..16c9e854b 100644
--- a/src/libstrongswan/asn1/oid.h
+++ b/src/libstrongswan/asn1/oid.h
@@ -116,92 +116,93 @@ extern const oid_t oid_names[];
 #define OID_ECDSA_WITH_SHA256				158
 #define OID_ECDSA_WITH_SHA384				159
 #define OID_ECDSA_WITH_SHA512				160
-#define OID_TCGID							181
-#define OID_AUTHORITY_INFO_ACCESS			186
-#define OID_IP_ADDR_BLOCKS					187
-#define OID_SERVER_AUTH						192
-#define OID_CLIENT_AUTH						193
-#define OID_OCSP_SIGNING					200
-#define OID_XMPP_ADDR						202
-#define OID_AUTHENTICATION_INFO				204
-#define OID_ACCESS_IDENTITY					205
-#define OID_CHARGING_IDENTITY				206
-#define OID_GROUP							207
-#define OID_OCSP							210
-#define OID_BASIC							211
-#define OID_NONCE							212
-#define OID_CRL								213
-#define OID_RESPONSE						214
-#define OID_NO_CHECK						215
-#define OID_ARCHIVE_CUTOFF					216
-#define OID_SERVICE_LOCATOR					217
-#define OID_CA_ISSUERS						218
-#define OID_DES_CBC							224
-#define OID_SHA1							225
-#define OID_SHA1_WITH_RSA_OIW				226
-#define OID_ECGDSA_PUBKEY					245
-#define OID_ECGDSA_SIG_WITH_RIPEMD160		248
-#define OID_ECGDSA_SIG_WITH_SHA1			249
-#define OID_ECGDSA_SIG_WITH_SHA224			250
-#define OID_ECGDSA_SIG_WITH_SHA256			251
-#define OID_ECGDSA_SIG_WITH_SHA384			252
-#define OID_ECGDSA_SIG_WITH_SHA512			253
-#define OID_SECT163K1						276
-#define OID_SECT163R1						277
-#define OID_SECT239K1						278
-#define OID_SECT113R1						279
-#define OID_SECT113R2						280
-#define OID_SECT112R1						281
-#define OID_SECT112R2						282
-#define OID_SECT160R1						283
-#define OID_SECT160K1						284
-#define OID_SECT256K1						285
-#define OID_SECT163R2						286
-#define OID_SECT283K1						287
-#define OID_SECT283R1						288
-#define OID_SECT131R1						289
-#define OID_SECT131R2						290
-#define OID_SECT193R1						291
-#define OID_SECT193R2						292
-#define OID_SECT233K1						293
-#define OID_SECT233R1						294
-#define OID_SECT128R1						295
-#define OID_SECT128R2						296
-#define OID_SECT160R2						297
-#define OID_SECT192K1						298
-#define OID_SECT224K1						299
-#define OID_SECT224R1						300
-#define OID_SECT384R1						301
-#define OID_SECT521R1						302
-#define OID_SECT409K1						303
-#define OID_SECT409R1						304
-#define OID_SECT571K1						305
-#define OID_SECT571R1						306
-#define OID_AES128_CBC						315
-#define OID_AES128_GCM						316
-#define OID_AES128_CCM						317
-#define OID_AES192_CBC						318
-#define OID_AES192_GCM						319
-#define OID_AES192_CCM						320
-#define OID_AES256_CBC						321
-#define OID_AES256_GCM						322
-#define OID_AES256_CCM						323
-#define OID_SHA256							325
-#define OID_SHA384							326
-#define OID_SHA512							327
-#define OID_SHA224							328
-#define OID_NS_REVOCATION_URL				334
-#define OID_NS_CA_REVOCATION_URL			335
-#define OID_NS_CA_POLICY_URL				336
-#define OID_NS_COMMENT						337
-#define OID_EMPLOYEE_NUMBER					340
-#define OID_PKI_MESSAGE_TYPE				346
-#define OID_PKI_STATUS						347
-#define OID_PKI_FAIL_INFO					348
-#define OID_PKI_SENDER_NONCE				349
-#define OID_PKI_RECIPIENT_NONCE				350
-#define OID_PKI_TRANS_ID					351
+#define OID_USER_PRINCIPAL_NAME				175
+#define OID_TCGID							182
+#define OID_AUTHORITY_INFO_ACCESS			187
+#define OID_IP_ADDR_BLOCKS					189
+#define OID_SERVER_AUTH						194
+#define OID_CLIENT_AUTH						195
+#define OID_OCSP_SIGNING					202
+#define OID_XMPP_ADDR						204
+#define OID_AUTHENTICATION_INFO				206
+#define OID_ACCESS_IDENTITY					207
+#define OID_CHARGING_IDENTITY				208
+#define OID_GROUP							209
+#define OID_OCSP							212
+#define OID_BASIC							213
+#define OID_NONCE							214
+#define OID_CRL								215
+#define OID_RESPONSE						216
+#define OID_NO_CHECK						217
+#define OID_ARCHIVE_CUTOFF					218
+#define OID_SERVICE_LOCATOR					219
+#define OID_CA_ISSUERS						220
+#define OID_DES_CBC							226
+#define OID_SHA1							227
+#define OID_SHA1_WITH_RSA_OIW				228
+#define OID_ECGDSA_PUBKEY					247
+#define OID_ECGDSA_SIG_WITH_RIPEMD160		250
+#define OID_ECGDSA_SIG_WITH_SHA1			251
+#define OID_ECGDSA_SIG_WITH_SHA224			252
+#define OID_ECGDSA_SIG_WITH_SHA256			253
+#define OID_ECGDSA_SIG_WITH_SHA384			254
+#define OID_ECGDSA_SIG_WITH_SHA512			255
+#define OID_SECT163K1						278
+#define OID_SECT163R1						279
+#define OID_SECT239K1						280
+#define OID_SECT113R1						281
+#define OID_SECT113R2						282
+#define OID_SECT112R1						283
+#define OID_SECT112R2						284
+#define OID_SECT160R1						285
+#define OID_SECT160K1						286
+#define OID_SECT256K1						287
+#define OID_SECT163R2						288
+#define OID_SECT283K1						289
+#define OID_SECT283R1						290
+#define OID_SECT131R1						291
+#define OID_SECT131R2						292
+#define OID_SECT193R1						293
+#define OID_SECT193R2						294
+#define OID_SECT233K1						295
+#define OID_SECT233R1						296
+#define OID_SECT128R1						297
+#define OID_SECT128R2						298
+#define OID_SECT160R2						299
+#define OID_SECT192K1						300
+#define OID_SECT224K1						301
+#define OID_SECT224R1						302
+#define OID_SECT384R1						303
+#define OID_SECT521R1						304
+#define OID_SECT409K1						305
+#define OID_SECT409R1						306
+#define OID_SECT571K1						307
+#define OID_SECT571R1						308
+#define OID_AES128_CBC						317
+#define OID_AES128_GCM						318
+#define OID_AES128_CCM						319
+#define OID_AES192_CBC						320
+#define OID_AES192_GCM						321
+#define OID_AES192_CCM						322
+#define OID_AES256_CBC						323
+#define OID_AES256_GCM						324
+#define OID_AES256_CCM						325
+#define OID_SHA256							327
+#define OID_SHA384							328
+#define OID_SHA512							329
+#define OID_SHA224							330
+#define OID_NS_REVOCATION_URL				336
+#define OID_NS_CA_REVOCATION_URL			337
+#define OID_NS_CA_POLICY_URL				338
+#define OID_NS_COMMENT						339
+#define OID_EMPLOYEE_NUMBER					342
+#define OID_PKI_MESSAGE_TYPE				348
+#define OID_PKI_STATUS						349
+#define OID_PKI_FAIL_INFO					350
+#define OID_PKI_SENDER_NONCE				351
+#define OID_PKI_RECIPIENT_NONCE				352
+#define OID_PKI_TRANS_ID					353
 
-#define OID_MAX								354
+#define OID_MAX								356
 
 #endif /* OID_H_ */
diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index 5d729c2eb..36db0299c 100644
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -173,6 +173,7 @@
               0x14           "msEnrollmentInfrastructure"
                 0x02         "msCertificateTypeExtension"
                   0x02       "msSmartcardLogon"
+                  0x03       "msUPN"					OID_USER_PRINCIPAL_NAME
           0x89               ""
             0x31             ""
               0x01           ""
@@ -185,6 +186,7 @@
           0x07               "id-pkix"
             0x01             "id-pe"
               0x01           "authorityInfoAccess"		OID_AUTHORITY_INFO_ACCESS
+              0x03           "qcStatements"
               0x07           "ipAddrBlocks"				OID_IP_ADDR_BLOCKS
             0x02             "id-qt"
               0x01           "cps"