diff --git a/library/oid.c b/library/oid.c
new file mode 100644
index 0000000..53c2e5d
--- /dev/null
+++ b/library/oid.c
@@ -0,0 +1,550 @@
+/**
+ * \file oid.c
+ *
+ * \brief Object Identifier (OID) database
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_OID_C)
+
+#include "polarssl/oid.h"
+#include "polarssl/md.h"
+#include "polarssl/rsa.h"
+
+/*
+ * For X520 attribute types
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    const char          *short_name;
+} oid_x520_attr_t;
+
+static const oid_x520_attr_t oid_x520_attr_type[] =
+{
+    {
+        { OID_AT_CN,          "id-at-commonName",               "Common Name" },
+        "CN",
+    },
+    {
+        { OID_AT_COUNTRY,     "id-at-countryName",              "Country" },
+        "C",
+    },
+    {
+        { OID_AT_LOCALITY,    "id-at-locality",                 "Locality" },
+        "L",
+    },
+    {
+        { OID_AT_STATE,       "id-at-state",                    "State" },
+        "ST",
+    },
+    {
+        { OID_AT_ORGANIZATION,"id-at-organizationName",         "Organization" },
+        "O",
+    },
+    {
+        { OID_AT_ORG_UNIT,    "id-at-organizationalUnitName",   "Org Unit" },
+        "OU",
+    },
+    {
+        { OID_PKCS9_EMAIL,    "emailAddress",                   "E-mail address" },
+        "emailAddress",
+    },
+    {
+        { NULL, NULL, NULL },
+        NULL,
+    }
+};
+
+/*
+ * For X509 extensions
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    int                 ext_type;
+} oid_x509_ext_t;
+
+static const oid_x509_ext_t oid_x509_ext[] =
+{
+    {
+        { OID_BASIC_CONSTRAINTS,    "id-ce-basicConstraints",   "Basic Constraints" },
+        EXT_BASIC_CONSTRAINTS,
+    },
+    {
+        { OID_KEY_USAGE,            "id-ce-keyUsage",           "Key Usage" },
+        EXT_KEY_USAGE,
+    },
+    {
+        { OID_EXTENDED_KEY_USAGE,   "id-ce-keyUsage",           "Extended Key Usage" },
+        EXT_EXTENDED_KEY_USAGE,
+    },
+    {
+        { OID_SUBJECT_ALT_NAME,     "id-ce-subjectAltName",     "Subject Alt Name" },
+        EXT_SUBJECT_ALT_NAME,
+    },
+    {
+        { OID_NS_CERT_TYPE,         "id-netscape-certtype",     "Netscape Certificate Type" },
+        EXT_NS_CERT_TYPE,
+    },
+    {
+        { NULL, NULL, NULL },
+        0,
+    },
+};
+
+static const oid_descriptor_t oid_ext_key_usage[] =
+{
+    { OID_SERVER_AUTH,      "id-kp-serverAuth",      "TLS Web Server Authentication" },
+    { OID_CLIENT_AUTH,      "id-kp-clientAuth",      "TLS Web Client Authentication" },
+    { OID_CODE_SIGNING,     "id-kp-codeSigning",     "Code Signing" },
+    { OID_EMAIL_PROTECTION, "id-kp-emailProtection", "E-mail Protection" },
+    { OID_TIME_STAMPING,    "id-kp-timeStamping",    "Time Stamping" },
+    { OID_OCSP_SIGNING,     "id-kp-OCSPSigning",     "OCSP Signing" },
+    { NULL, NULL, NULL },
+};
+
+/*
+ * For SignatureAlgorithmIdentifier
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    md_type_t           md_alg;
+    pk_type_t           pk_alg;
+} oid_sig_alg_t;
+
+static const oid_sig_alg_t oid_sig_alg[] =
+{
+    {
+        { OID_PKCS1_MD2,        "md2WithRSAEncryption",     "RSA with MD2" },
+        POLARSSL_MD_MD2,      POLARSSL_PK_RSA,
+    },
+    {
+        { OID_PKCS1_MD4,        "md4WithRSAEncryption",     "RSA with MD4" },
+        POLARSSL_MD_MD4,      POLARSSL_PK_RSA,
+    },
+    {
+        { OID_PKCS1_MD5,        "md5WithRSAEncryption",     "RSA with MD5" },
+        POLARSSL_MD_MD5,      POLARSSL_PK_RSA,
+    },
+    {
+        { OID_PKCS1_SHA1,       "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        POLARSSL_MD_SHA1,     POLARSSL_PK_RSA,
+    },
+    {
+        { OID_PKCS1_SHA224,     "sha224WithRSAEncryption",  "RSA with SHA-224" },
+        POLARSSL_MD_SHA224,   POLARSSL_PK_RSA,
+    },
+    {
+        { OID_PKCS1_SHA256,     "sha256WithRSAEncryption",  "RSA with SHA-256" },
+        POLARSSL_MD_SHA256,   POLARSSL_PK_RSA,
+    },
+    {
+        { OID_PKCS1_SHA384,     "sha384WithRSAEncryption",  "RSA with SHA-384" },
+        POLARSSL_MD_SHA384,   POLARSSL_PK_RSA,
+    },
+    {
+        { OID_PKCS1_SHA512,     "sha512WithRSAEncryption",  "RSA with SHA-512" },
+        POLARSSL_MD_SHA512,   POLARSSL_PK_RSA,
+    },
+    {
+        { OID_RSA_SHA_OBS,      "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        POLARSSL_MD_SHA1,     POLARSSL_PK_RSA,
+    },
+    {
+        { NULL, NULL, NULL },
+        0, 0,
+    },
+};
+
+/*
+ * For PublicKeyInfo
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    pk_type_t           pk_alg;
+} oid_pk_alg_t;
+
+static const oid_pk_alg_t oid_pk_alg[] =
+{
+    {
+        { OID_PKCS1_RSA,      "rsaEncryption",   "RSA" },
+        POLARSSL_PK_RSA,
+    },
+    {
+        { NULL, NULL, NULL },
+        0,
+    },
+};
+
+/*
+ * For digestAlgorithm
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    md_type_t           md_alg;
+} oid_md_alg_t;
+
+static const oid_md_alg_t oid_md_alg[] =
+{
+    {
+        { OID_DIGEST_ALG_MD2,       "id-md2",       "MD2" },
+        POLARSSL_MD_MD2,
+    },
+    {
+        { OID_DIGEST_ALG_MD4,       "id-md4",       "MD4" },
+        POLARSSL_MD_MD4,
+    },
+    {
+        { OID_DIGEST_ALG_MD5,       "id-md5",       "MD5" },
+        POLARSSL_MD_MD5,
+    },
+    {
+        { OID_DIGEST_ALG_SHA1,      "id-sha1",      "SHA-1" },
+        POLARSSL_MD_SHA1,
+    },
+    {
+        { OID_DIGEST_ALG_SHA1,      "id-sha1",      "SHA-1" },
+        POLARSSL_MD_SHA1,
+    },
+    {
+        { OID_DIGEST_ALG_SHA224,    "id-sha224",    "SHA-224" },
+        POLARSSL_MD_SHA224,
+    },
+    {
+        { OID_DIGEST_ALG_SHA256,    "id-sha256",    "SHA-256" },
+        POLARSSL_MD_SHA256,
+    },
+    {
+        { OID_DIGEST_ALG_SHA384,    "id-sha384",    "SHA-384" },
+        POLARSSL_MD_SHA384,
+    },
+    {
+        { OID_DIGEST_ALG_SHA512,    "id-sha512",    "SHA-512" },
+        POLARSSL_MD_SHA512,
+    },
+    {
+        { NULL, NULL, NULL },
+        0,
+    },
+};
+
+#if defined _MSC_VER && !defined snprintf
+#include <stdarg.h>
+
+#if !defined vsnprintf
+#define vsnprintf _vsnprintf
+#endif // vsnprintf
+
+/*
+ * Windows _snprintf and _vsnprintf are not compatible to linux versions.
+ * Result value is not size of buffer needed, but -1 if no fit is possible.
+ *
+ * This fuction tries to 'fix' this by at least suggesting enlarging the
+ * size by 20.
+ */
+static int compat_snprintf(char *str, size_t size, const char *format, ...)
+{
+    va_list ap;
+    int res = -1;
+
+    va_start( ap, format );
+
+    res = vsnprintf( str, size, format, ap );
+
+    va_end( ap );
+
+    // No quick fix possible
+    if ( res < 0 )
+        return( (int) size + 20 );
+
+    return res;
+}
+
+#define snprintf compat_snprintf
+#endif
+
+#define POLARSSL_ERR_DEBUG_BUF_TOO_SMALL    -2
+
+#define SAFE_SNPRINTF()                         \
+{                                               \
+    if( ret == -1 )                             \
+        return( -1 );                           \
+                                                \
+    if ( (unsigned int) ret > n ) {             \
+        p[n - 1] = '\0';                        \
+        return POLARSSL_ERR_DEBUG_BUF_TOO_SMALL;\
+    }                                           \
+                                                \
+    n -= (unsigned int) ret;                    \
+    p += (unsigned int) ret;                    \
+}
+
+/* Return the x.y.z.... style numeric string for the given OID */
+int oid_get_numeric_string( char *buf, size_t size,
+                            const asn1_buf *oid )
+{
+    int ret;
+    size_t i, n;
+    unsigned int value;
+    char *p;
+
+    p = buf;
+    n = size;
+
+    /* First byte contains first two dots */
+    if( oid->len > 0 )
+    {
+        ret = snprintf( p, n, "%d.%d", oid->p[0] / 40, oid->p[0] % 40 );
+        SAFE_SNPRINTF();
+    }
+
+    /* Prevent overflow in value. */
+    if( oid->len > sizeof(value) )
+        return( POLARSSL_ERR_DEBUG_BUF_TOO_SMALL );
+
+    value = 0;
+    for( i = 1; i < oid->len; i++ )
+    {
+        value <<= 7;
+        value += oid->p[i] & 0x7F;
+
+        if( !( oid->p[i] & 0x80 ) )
+        {
+            /* Last byte */
+            ret = snprintf( p, n, ".%d", value );
+            SAFE_SNPRINTF();
+            value = 0;
+        }
+    }
+
+    return( (int) ( size - n ) );
+}
+
+static const oid_descriptor_t *oid_descriptor_from_buf(
+                const void *struct_set,
+                size_t struct_size,
+                const unsigned char *oid,
+                size_t len )
+{
+    const unsigned char *p = (unsigned char *) struct_set;
+    const oid_descriptor_t *cur;
+
+    if( struct_set == NULL || oid == NULL )
+        return( NULL );
+
+    cur = (const oid_descriptor_t *) p;
+    while( cur->asn1 != NULL )
+    {
+        if( strlen( cur->asn1 ) == len &&
+            memcmp( cur->asn1, oid, len ) == 0 )
+        {
+            return( cur );
+        }
+
+        p += struct_size;
+        cur = (const oid_descriptor_t *) p;
+    }
+
+    return( NULL );
+}
+
+static const oid_descriptor_t *oid_descriptor_from_asn1(
+                const void *struct_set,
+                size_t struct_size,
+                const asn1_buf *oid )
+{
+    return oid_descriptor_from_buf( struct_set, struct_size,
+                                    oid->p, oid->len );
+}
+
+int oid_get_extended_key_usage( const asn1_buf *oid, const char **desc )
+{
+    const oid_descriptor_t *data = oid_descriptor_from_asn1(
+                                oid_ext_key_usage,
+                                sizeof(oid_descriptor_t),
+                                oid );
+
+    if( data == NULL )
+        return( POLARSSL_ERR_OID_NOT_FOUND );
+
+    *desc = data->description;
+
+    return( 0 );
+}
+
+static const oid_x509_ext_t *oid_x509_ext_from_asn1( const asn1_buf *oid )
+{
+    return (const oid_x509_ext_t *) oid_descriptor_from_asn1(
+                                oid_x509_ext,
+                                sizeof(oid_x509_ext_t),
+                                oid );
+}
+
+static const oid_x520_attr_t *oid_x520_attr_from_asn1( const asn1_buf *oid )
+{
+    return (const oid_x520_attr_t *) oid_descriptor_from_asn1(
+                                oid_x520_attr_type,
+                                sizeof(oid_x520_attr_t),
+                                oid );
+}
+
+static const oid_pk_alg_t *oid_pk_alg_from_asn1( const asn1_buf *oid )
+{
+    return (const oid_pk_alg_t *) oid_descriptor_from_asn1(
+                                oid_pk_alg,
+                                sizeof(oid_pk_alg_t),
+                                oid );
+}
+
+static const oid_sig_alg_t *oid_sig_alg_from_asn1( const asn1_buf *oid )
+{
+    return (const oid_sig_alg_t *) oid_descriptor_from_asn1(
+                                oid_sig_alg,
+                                sizeof(oid_sig_alg_t),
+                                oid );
+}
+
+static const oid_md_alg_t *oid_md_alg_from_asn1( const asn1_buf *oid )
+{
+    return (const oid_md_alg_t *) oid_descriptor_from_asn1(
+                                oid_md_alg,
+                                sizeof(oid_md_alg_t),
+                                oid );
+}
+
+int oid_get_x509_ext_type( const asn1_buf *oid, int *ext_type )
+{
+    const oid_x509_ext_t *data = oid_x509_ext_from_asn1( oid );
+
+    if( data == NULL )
+        return( POLARSSL_ERR_OID_NOT_FOUND );
+
+    *ext_type = data->ext_type;
+
+    return( 0 );
+}
+
+int oid_get_attr_short_name( const asn1_buf *oid, const char **short_name )
+{
+    const oid_x520_attr_t *data = oid_x520_attr_from_asn1( oid );
+
+    if( data == NULL )
+        return( POLARSSL_ERR_OID_NOT_FOUND );
+
+    *short_name = data->short_name;
+
+    return( 0 );
+}
+
+int oid_get_pk_alg( const asn1_buf *oid, pk_type_t *pk_alg )
+{
+    const oid_pk_alg_t *data = oid_pk_alg_from_asn1( oid );
+
+    if( data == NULL )
+        return( POLARSSL_ERR_OID_NOT_FOUND );
+
+    *pk_alg = data->pk_alg;
+
+    return( 0 );
+}
+
+int oid_get_sig_alg_desc( const asn1_buf *oid, const char **desc )
+{
+    const oid_sig_alg_t *data = oid_sig_alg_from_asn1( oid );
+
+    if( data == NULL )
+        return( POLARSSL_ERR_OID_NOT_FOUND );
+
+    *desc = data->descriptor.description;
+
+    return( 0 );
+}
+
+int oid_get_sig_alg( const asn1_buf *oid,
+                     md_type_t *md_alg, pk_type_t *pk_alg )
+{
+    const oid_sig_alg_t *data = oid_sig_alg_from_asn1( oid );
+
+    if( data == NULL )
+        return( POLARSSL_ERR_OID_NOT_FOUND );
+
+    *md_alg = data->md_alg;
+    *pk_alg = data->pk_alg;
+
+    return( 0 );
+}
+
+int oid_get_oid_by_sig_alg( pk_type_t pk_alg, md_type_t md_alg,
+                            const char **oid_str )
+{
+    const oid_sig_alg_t *cur = oid_sig_alg;
+
+    while( cur->descriptor.asn1 != NULL )
+    {
+        if( cur->pk_alg == pk_alg &&
+            cur->md_alg == md_alg )
+        {
+            *oid_str = cur->descriptor.asn1;
+            return( 0 );
+        }
+
+        cur++;
+    }
+
+    return( POLARSSL_ERR_OID_NOT_FOUND );
+}
+
+int oid_get_md_alg( const asn1_buf *oid,
+                    md_type_t *md_alg )
+{
+    const oid_md_alg_t *data = oid_md_alg_from_asn1( oid );
+
+    if( data == NULL )
+        return( POLARSSL_ERR_OID_NOT_FOUND );
+
+    *md_alg = data->md_alg;
+
+    return( 0 );
+}
+
+int oid_get_oid_by_md( md_type_t md_alg,
+                       const char **oid_str )
+{
+    const oid_md_alg_t *cur = oid_md_alg;
+
+    while( cur->descriptor.asn1 != NULL )
+    {
+        if( cur->md_alg == md_alg )
+        {
+            *oid_str = cur->descriptor.asn1;
+            return( 0 );
+        }
+
+        cur++;
+    }
+
+    return( POLARSSL_ERR_OID_NOT_FOUND );
+}
+
+#endif /* POLARSSL_OID_C */