[svn-upgrade] Integrating new upstream version, strongswan (4.1.11)

1 files changed, 111 insertions, 110 deletions

diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index 28a915433..63896be6b 100644
--- a/src/libstrongswan/asn1/oid.c
+++ b/src/libstrongswan/asn1/oid.c
@@ -1,5 +1,5 @@
 /* List of some useful object identifiers (OIDs)
- * Copyright (C) 2003-2004 Andreas Steffen, Zuercher Hochschule Winterthur
+ * Copyright (C) 2003-2008 Andreas Steffen, Hochschule fuer Technik Rapperswil
  * 
  * This file has been automatically generated by the script oid.pl
  * Do not edit manually!
@@ -62,7 +62,7 @@ const oid_t oid_names[] = {
   {    0x25,                  50, 0, "extendedKeyUsage"          },  /*  49 */
   {    0x37,                  51, 0, "targetInformation"         },  /*  50 */
   {    0x38,                   0, 0, "noRevAvail"                },  /*  51 */
-  {0x2A,                      94, 1, ""                          },  /*  52 */
+  {0x2A,                      95, 1, ""                          },  /*  52 */
   {  0x86,                     0, 1, ""                          },  /*  53 */
   {    0x48,                   0, 1, ""                          },  /*  54 */
   {      0x86,                 0, 1, ""                          },  /*  55 */
@@ -73,7 +73,7 @@ const oid_t oid_names[] = {
   {                0x00,       0, 0, "entrustVersInfo"           },  /*  60 */
   {        0xF7,               0, 1, ""                          },  /*  61 */
   {          0x0D,             0, 1, "RSADSI"                    },  /*  62 */
-  {            0x01,          89, 1, "PKCS"                      },  /*  63 */
+  {            0x01,          90, 1, "PKCS"                      },  /*  63 */
   {              0x01,        72, 1, "PKCS-1"                    },  /*  64 */
   {                0x01,      66, 0, "rsaEncryption"             },  /*  65 */
   {                0x02,      67, 0, "md2WithRSAEncryption"      },  /*  66 */
@@ -98,111 +98,112 @@ const oid_t oid_names[] = {
   {                0x06,      86, 0, "counterSignature"          },  /*  85 */
   {                0x07,      87, 0, "challengePassword"         },  /*  86 */
   {                0x08,      88, 0, "unstructuredAddress"       },  /*  87 */
-  {                0x0E,       0, 0, "extensionRequest"          },  /*  88 */
-  {            0x02,          92, 1, "digestAlgorithm"           },  /*  89 */
-  {              0x02,        91, 0, "md2"                       },  /*  90 */
-  {              0x05,         0, 0, "md5"                       },  /*  91 */
-  {            0x03,           0, 1, "encryptionAlgorithm"       },  /*  92 */
-  {              0x07,         0, 0, "3des-ede-cbc"              },  /*  93 */
-  {0x2B,                     160, 1, ""                          },  /*  94 */
-  {  0x06,                   147, 1, "dod"                       },  /*  95 */
-  {    0x01,                   0, 1, "internet"                  },  /*  96 */
-  {      0x04,               115, 1, "private"                   },  /*  97 */
-  {        0x01,               0, 1, "enterprise"                },  /*  98 */
-  {          0x82,           108, 1, ""                          },  /*  99 */
-  {            0x37,           0, 1, "Microsoft"                 },  /* 100 */
-  {              0x0A,       105, 1, ""                          },  /* 101 */
-  {                0x03,       0, 1, ""                          },  /* 102 */
-  {                  0x03,   104, 0, "msSGC"                     },  /* 103 */
-  {                  0x04,     0, 0, "msEncryptingFileSystem"    },  /* 104 */
-  {              0x14,         0, 1, "msEnrollmentInfrastructure"},  /* 105 */
-  {                0x02,       0, 1, "msCertificateTypeExtension"},  /* 106 */
-  {                  0x02,     0, 0, "msSmartcardLogon"          },  /* 107 */
-  {          0x89,             0, 1, ""                          },  /* 108 */
-  {            0x31,           0, 1, ""                          },  /* 109 */
-  {              0x01,         0, 1, ""                          },  /* 110 */
-  {                0x01,       0, 1, ""                          },  /* 111 */
-  {                  0x02,     0, 1, ""                          },  /* 112 */
-  {                    0x02, 114, 0, ""                          },  /* 113 */
-  {                    0x4B,   0, 0, "TCGID"                     },  /* 114 */
-  {      0x05,                 0, 1, "security"                  },  /* 115 */
-  {        0x05,               0, 1, "mechanisms"                },  /* 116 */
-  {          0x07,             0, 1, "id-pkix"                   },  /* 117 */
-  {            0x01,         120, 1, "id-pe"                     },  /* 118 */
-  {              0x01,         0, 0, "authorityInfoAccess"       },  /* 119 */
-  {            0x03,         130, 1, "id-kp"                     },  /* 120 */
-  {              0x01,       122, 0, "serverAuth"                },  /* 121 */
-  {              0x02,       123, 0, "clientAuth"                },  /* 122 */
-  {              0x03,       124, 0, "codeSigning"               },  /* 123 */
-  {              0x04,       125, 0, "emailProtection"           },  /* 124 */
-  {              0x05,       126, 0, "ipsecEndSystem"            },  /* 125 */
-  {              0x06,       127, 0, "ipsecTunnel"               },  /* 126 */
-  {              0x07,       128, 0, "ipsecUser"                 },  /* 127 */
-  {              0x08,       129, 0, "timeStamping"              },  /* 128 */
-  {              0x09,         0, 0, "ocspSigning"               },  /* 129 */
-  {            0x08,         132, 1, "id-otherNames"             },  /* 130 */
-  {              0x05,         0, 0, "xmppAddr"                  },  /* 131 */
-  {            0x0A,         137, 1, "id-aca"                    },  /* 132 */
-  {              0x01,       134, 0, "authenticationInfo"        },  /* 133 */
-  {              0x02,       135, 0, "accessIdentity"            },  /* 134 */
-  {              0x03,       136, 0, "chargingIdentity"          },  /* 135 */
-  {              0x04,         0, 0, "group"                     },  /* 136 */
-  {            0x30,           0, 1, "id-ad"                     },  /* 137 */
-  {              0x01,       146, 1, "ocsp"                      },  /* 138 */
-  {                0x01,     140, 0, "basic"                     },  /* 139 */
-  {                0x02,     141, 0, "nonce"                     },  /* 140 */
-  {                0x03,     142, 0, "crl"                       },  /* 141 */
-  {                0x04,     143, 0, "response"                  },  /* 142 */
-  {                0x05,     144, 0, "noCheck"                   },  /* 143 */
-  {                0x06,     145, 0, "archiveCutoff"             },  /* 144 */
-  {                0x07,       0, 0, "serviceLocator"            },  /* 145 */
-  {              0x02,         0, 0, "caIssuers"                 },  /* 146 */
-  {  0x0E,                   153, 1, "oiw"                       },  /* 147 */
-  {    0x03,                   0, 1, "secsig"                    },  /* 148 */
-  {      0x02,                 0, 1, "algorithms"                },  /* 149 */
-  {        0x07,             151, 0, "des-cbc"                   },  /* 150 */
-  {        0x1A,             152, 0, "sha-1"                     },  /* 151 */
-  {        0x1D,               0, 0, "sha-1WithRSASignature"     },  /* 152 */
-  {  0x24,                     0, 1, "TeleTrusT"                 },  /* 153 */
-  {    0x03,                   0, 1, "algorithm"                 },  /* 154 */
-  {      0x03,                 0, 1, "signatureAlgorithm"        },  /* 155 */
-  {        0x01,               0, 1, "rsaSignature"              },  /* 156 */
-  {          0x02,           158, 0, "rsaSigWithripemd160"       },  /* 157 */
-  {          0x03,           159, 0, "rsaSigWithripemd128"       },  /* 158 */
-  {          0x04,             0, 0, "rsaSigWithripemd256"       },  /* 159 */
-  {0x60,                       0, 1, ""                          },  /* 160 */
-  {  0x86,                     0, 1, ""                          },  /* 161 */
-  {    0x48,                   0, 1, ""                          },  /* 162 */
-  {      0x01,                 0, 1, "organization"              },  /* 163 */
-  {        0x65,             171, 1, "gov"                       },  /* 164 */
-  {          0x03,             0, 1, "csor"                      },  /* 165 */
-  {            0x04,           0, 1, "nistalgorithm"             },  /* 166 */
-  {              0x02,         0, 1, "hashalgs"                  },  /* 167 */
-  {                0x01,     169, 0, "id-SHA-256"                },  /* 168 */
-  {                0x02,     170, 0, "id-SHA-384"                },  /* 169 */
-  {                0x03,       0, 0, "id-SHA-512"                },  /* 170 */
-  {        0x86,               0, 1, ""                          },  /* 171 */
-  {          0xf8,             0, 1, ""                          },  /* 172 */
-  {            0x42,         185, 1, "netscape"                  },  /* 173 */
-  {              0x01,       180, 1, ""                          },  /* 174 */
-  {                0x01,     176, 0, "nsCertType"                },  /* 175 */
-  {                0x03,     177, 0, "nsRevocationUrl"           },  /* 176 */
-  {                0x04,     178, 0, "nsCaRevocationUrl"         },  /* 177 */
-  {                0x08,     179, 0, "nsCaPolicyUrl"             },  /* 178 */
-  {                0x0d,       0, 0, "nsComment"                 },  /* 179 */
-  {              0x03,       183, 1, "directory"                 },  /* 180 */
-  {                0x01,       0, 1, ""                          },  /* 181 */
-  {                  0x03,     0, 0, "employeeNumber"            },  /* 182 */
-  {              0x04,         0, 1, "policy"                    },  /* 183 */
-  {                0x01,       0, 0, "nsSGC"                     },  /* 184 */
-  {            0x45,           0, 1, "verisign"                  },  /* 185 */
-  {              0x01,         0, 1, "pki"                       },  /* 186 */
-  {                0x09,       0, 1, "attributes"                },  /* 187 */
-  {                  0x02,   189, 0, "messageType"               },  /* 188 */
-  {                  0x03,   190, 0, "pkiStatus"                 },  /* 189 */
-  {                  0x04,   191, 0, "failInfo"                  },  /* 190 */
-  {                  0x05,   192, 0, "senderNonce"               },  /* 191 */
-  {                  0x06,   193, 0, "recipientNonce"            },  /* 192 */
-  {                  0x07,   194, 0, "transID"                   },  /* 193 */
-  {                  0x08,     0, 0, "extensionReq"              }   /* 194 */
+  {                0x0E,      89, 0, "extensionRequest"          },  /*  88 */
+  {                0x0F,       0, 0, "S/MIME Capabilities"       },  /*  89 */
+  {            0x02,          93, 1, "digestAlgorithm"           },  /*  90 */
+  {              0x02,        92, 0, "md2"                       },  /*  91 */
+  {              0x05,         0, 0, "md5"                       },  /*  92 */
+  {            0x03,           0, 1, "encryptionAlgorithm"       },  /*  93 */
+  {              0x07,         0, 0, "3des-ede-cbc"              },  /*  94 */
+  {0x2B,                     161, 1, ""                          },  /*  95 */
+  {  0x06,                   148, 1, "dod"                       },  /*  96 */
+  {    0x01,                   0, 1, "internet"                  },  /*  97 */
+  {      0x04,               116, 1, "private"                   },  /*  98 */
+  {        0x01,               0, 1, "enterprise"                },  /*  99 */
+  {          0x82,           109, 1, ""                          },  /* 100 */
+  {            0x37,           0, 1, "Microsoft"                 },  /* 101 */
+  {              0x0A,       106, 1, ""                          },  /* 102 */
+  {                0x03,       0, 1, ""                          },  /* 103 */
+  {                  0x03,   105, 0, "msSGC"                     },  /* 104 */
+  {                  0x04,     0, 0, "msEncryptingFileSystem"    },  /* 105 */
+  {              0x14,         0, 1, "msEnrollmentInfrastructure"},  /* 106 */
+  {                0x02,       0, 1, "msCertificateTypeExtension"},  /* 107 */
+  {                  0x02,     0, 0, "msSmartcardLogon"          },  /* 108 */
+  {          0x89,             0, 1, ""                          },  /* 109 */
+  {            0x31,           0, 1, ""                          },  /* 110 */
+  {              0x01,         0, 1, ""                          },  /* 111 */
+  {                0x01,       0, 1, ""                          },  /* 112 */
+  {                  0x02,     0, 1, ""                          },  /* 113 */
+  {                    0x02, 115, 0, ""                          },  /* 114 */
+  {                    0x4B,   0, 0, "TCGID"                     },  /* 115 */
+  {      0x05,                 0, 1, "security"                  },  /* 116 */
+  {        0x05,               0, 1, "mechanisms"                },  /* 117 */
+  {          0x07,             0, 1, "id-pkix"                   },  /* 118 */
+  {            0x01,         121, 1, "id-pe"                     },  /* 119 */
+  {              0x01,         0, 0, "authorityInfoAccess"       },  /* 120 */
+  {            0x03,         131, 1, "id-kp"                     },  /* 121 */
+  {              0x01,       123, 0, "serverAuth"                },  /* 122 */
+  {              0x02,       124, 0, "clientAuth"                },  /* 123 */
+  {              0x03,       125, 0, "codeSigning"               },  /* 124 */
+  {              0x04,       126, 0, "emailProtection"           },  /* 125 */
+  {              0x05,       127, 0, "ipsecEndSystem"            },  /* 126 */
+  {              0x06,       128, 0, "ipsecTunnel"               },  /* 127 */
+  {              0x07,       129, 0, "ipsecUser"                 },  /* 128 */
+  {              0x08,       130, 0, "timeStamping"              },  /* 129 */
+  {              0x09,         0, 0, "ocspSigning"               },  /* 130 */
+  {            0x08,         133, 1, "id-otherNames"             },  /* 131 */
+  {              0x05,         0, 0, "xmppAddr"                  },  /* 132 */
+  {            0x0A,         138, 1, "id-aca"                    },  /* 133 */
+  {              0x01,       135, 0, "authenticationInfo"        },  /* 134 */
+  {              0x02,       136, 0, "accessIdentity"            },  /* 135 */
+  {              0x03,       137, 0, "chargingIdentity"          },  /* 136 */
+  {              0x04,         0, 0, "group"                     },  /* 137 */
+  {            0x30,           0, 1, "id-ad"                     },  /* 138 */
+  {              0x01,       147, 1, "ocsp"                      },  /* 139 */
+  {                0x01,     141, 0, "basic"                     },  /* 140 */
+  {                0x02,     142, 0, "nonce"                     },  /* 141 */
+  {                0x03,     143, 0, "crl"                       },  /* 142 */
+  {                0x04,     144, 0, "response"                  },  /* 143 */
+  {                0x05,     145, 0, "noCheck"                   },  /* 144 */
+  {                0x06,     146, 0, "archiveCutoff"             },  /* 145 */
+  {                0x07,       0, 0, "serviceLocator"            },  /* 146 */
+  {              0x02,         0, 0, "caIssuers"                 },  /* 147 */
+  {  0x0E,                   154, 1, "oiw"                       },  /* 148 */
+  {    0x03,                   0, 1, "secsig"                    },  /* 149 */
+  {      0x02,                 0, 1, "algorithms"                },  /* 150 */
+  {        0x07,             152, 0, "des-cbc"                   },  /* 151 */
+  {        0x1A,             153, 0, "sha-1"                     },  /* 152 */
+  {        0x1D,               0, 0, "sha-1WithRSASignature"     },  /* 153 */
+  {  0x24,                     0, 1, "TeleTrusT"                 },  /* 154 */
+  {    0x03,                   0, 1, "algorithm"                 },  /* 155 */
+  {      0x03,                 0, 1, "signatureAlgorithm"        },  /* 156 */
+  {        0x01,               0, 1, "rsaSignature"              },  /* 157 */
+  {          0x02,           159, 0, "rsaSigWithripemd160"       },  /* 158 */
+  {          0x03,           160, 0, "rsaSigWithripemd128"       },  /* 159 */
+  {          0x04,             0, 0, "rsaSigWithripemd256"       },  /* 160 */
+  {0x60,                       0, 1, ""                          },  /* 161 */
+  {  0x86,                     0, 1, ""                          },  /* 162 */
+  {    0x48,                   0, 1, ""                          },  /* 163 */
+  {      0x01,                 0, 1, "organization"              },  /* 164 */
+  {        0x65,             172, 1, "gov"                       },  /* 165 */
+  {          0x03,             0, 1, "csor"                      },  /* 166 */
+  {            0x04,           0, 1, "nistalgorithm"             },  /* 167 */
+  {              0x02,         0, 1, "hashalgs"                  },  /* 168 */
+  {                0x01,     170, 0, "id-SHA-256"                },  /* 169 */
+  {                0x02,     171, 0, "id-SHA-384"                },  /* 170 */
+  {                0x03,       0, 0, "id-SHA-512"                },  /* 171 */
+  {        0x86,               0, 1, ""                          },  /* 172 */
+  {          0xf8,             0, 1, ""                          },  /* 173 */
+  {            0x42,         186, 1, "netscape"                  },  /* 174 */
+  {              0x01,       181, 1, ""                          },  /* 175 */
+  {                0x01,     177, 0, "nsCertType"                },  /* 176 */
+  {                0x03,     178, 0, "nsRevocationUrl"           },  /* 177 */
+  {                0x04,     179, 0, "nsCaRevocationUrl"         },  /* 178 */
+  {                0x08,     180, 0, "nsCaPolicyUrl"             },  /* 179 */
+  {                0x0d,       0, 0, "nsComment"                 },  /* 180 */
+  {              0x03,       184, 1, "directory"                 },  /* 181 */
+  {                0x01,       0, 1, ""                          },  /* 182 */
+  {                  0x03,     0, 0, "employeeNumber"            },  /* 183 */
+  {              0x04,         0, 1, "policy"                    },  /* 184 */
+  {                0x01,       0, 0, "nsSGC"                     },  /* 185 */
+  {            0x45,           0, 1, "verisign"                  },  /* 186 */
+  {              0x01,         0, 1, "pki"                       },  /* 187 */
+  {                0x09,       0, 1, "attributes"                },  /* 188 */
+  {                  0x02,   190, 0, "messageType"               },  /* 189 */
+  {                  0x03,   191, 0, "pkiStatus"                 },  /* 190 */
+  {                  0x04,   192, 0, "failInfo"                  },  /* 191 */
+  {                  0x05,   193, 0, "senderNonce"               },  /* 192 */
+  {                  0x06,   194, 0, "recipientNonce"            },  /* 193 */
+  {                  0x07,   195, 0, "transID"                   },  /* 194 */
+  {                  0x08,     0, 0, "extensionReq"              }   /* 195 */
 };