[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/lib
|
From: |
shishi-commit |
|
Subject: |
CVS shishi/lib |
|
Date: |
Fri, 10 Sep 2004 11:04:16 +0200 |
Update of /home/cvs/shishi/lib
In directory dopio:/tmp/cvs-serv19534/lib
Modified Files:
ap.c aprep.c apreq.c as.c asn1.c asn1.h diskio.c kdc.c
kdcrep.c kdcreq.c krberror.c priv.c safe.c shishi.h.in tgs.c
ticket.c
Log Message:
ASN.1 cleanup.
--- /home/cvs/shishi/lib/ap.c 2004/04/18 09:38:34 1.66
+++ /home/cvs/shishi/lib/ap.c 2004/09/10 09:04:16 1.67
@@ -339,7 +339,7 @@
size_t buflen;
int res;
- res = shishi_a2d_new_field (ap->handle, node, field, &buf, &buflen);
+ res = shishi_asn1_to_der_field (ap->handle, node, field, &buf, &buflen);
if (res != SHISHI_OK)
return res;
@@ -746,7 +746,7 @@
if (rc != SHISHI_OK)
return rc;
- rc = shishi_new_a2d (ap->handle, ap->apreq, out, outlen);
+ rc = shishi_asn1_to_der (ap->handle, ap->apreq, out, outlen);
if (rc != SHISHI_OK)
return rc;
@@ -1093,7 +1093,7 @@
if (rc != SHISHI_OK)
return rc;
- rc = shishi_new_a2d (ap->handle, ap->aprep, out, outlen);
+ rc = shishi_asn1_to_der (ap->handle, ap->aprep, out, outlen);
if (rc != SHISHI_OK)
return rc;
--- /home/cvs/shishi/lib/aprep.c 2004/07/11 16:44:08 1.37
+++ /home/cvs/shishi/lib/aprep.c 2004/09/10 09:04:16 1.38
@@ -287,7 +287,7 @@
if (res != SHISHI_OK)
return res;
- res = shishi_new_a2d (handle, encapreppart, &der, &derlen);
+ res = shishi_asn1_to_der (handle, encapreppart, &der, &derlen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not DER encode authenticator: %s\n",
--- /home/cvs/shishi/lib/apreq.c 2004/08/01 17:30:17 1.45
+++ /home/cvs/shishi/lib/apreq.c 2004/09/10 09:04:16 1.46
@@ -374,7 +374,7 @@
char *der;
size_t derlen;
- res = shishi_new_a2d (handle, authenticator, &der, &derlen);
+ res = shishi_asn1_to_der (handle, authenticator, &der, &derlen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not DER encode authenticator: %s\n",
--- /home/cvs/shishi/lib/as.c 2004/04/18 09:43:14 1.41
+++ /home/cvs/shishi/lib/as.c 2004/09/10 09:04:16 1.42
@@ -177,7 +177,7 @@
{
int rc;
- rc = shishi_new_a2d (as->handle, as->asreq, out, outlen);
+ rc = shishi_asn1_to_der (as->handle, as->asreq, out, outlen);
if (rc != SHISHI_OK)
return rc;
@@ -388,7 +388,7 @@
{
int rc;
- rc = shishi_new_a2d (as->handle, as->asrep, out, outlen);
+ rc = shishi_asn1_to_der (as->handle, as->asrep, out, outlen);
if (rc != SHISHI_OK)
return rc;
--- /home/cvs/shishi/lib/asn1.c 2004/04/21 14:54:01 1.66
+++ /home/cvs/shishi/lib/asn1.c 2004/09/10 09:04:16 1.67
@@ -27,6 +27,7 @@
/* Defined in kerberos5.c, generated from kerberos5.asn1. */
extern const ASN1_ARRAY_TYPE shishi_asn1_tab[];
+/* Prototype in asn1.h, used by init.c. */
int
_shishi_asn1_init (Shishi * handle)
{
@@ -374,7 +375,7 @@
}
static Shishi_asn1
-shishi_asn1_new (Shishi * handle, const char *field, const char *name)
+asn1_new (Shishi * handle, const char *field, const char *name)
{
ASN1_TYPE node = ASN1_TYPE_EMPTY;
int res;
@@ -400,7 +401,7 @@
Shishi_asn1
shishi_asn1_asreq (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.AS-REQ", "KDC-REQ");
+ return asn1_new (handle, "Kerberos5.AS-REQ", "KDC-REQ");
}
/**
@@ -414,7 +415,7 @@
Shishi_asn1
shishi_asn1_asrep (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.AS-REP", "KDC-REP");
+ return asn1_new (handle, "Kerberos5.AS-REP", "KDC-REP");
}
/**
@@ -428,7 +429,7 @@
Shishi_asn1
shishi_asn1_tgsreq (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.TGS-REQ", "KDC-REQ");
+ return asn1_new (handle, "Kerberos5.TGS-REQ", "KDC-REQ");
}
/**
@@ -442,7 +443,7 @@
Shishi_asn1
shishi_asn1_tgsrep (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.TGS-REP", "KDC-REP");
+ return asn1_new (handle, "Kerberos5.TGS-REP", "KDC-REP");
}
/**
@@ -456,7 +457,7 @@
Shishi_asn1
shishi_asn1_apreq (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.AP-REQ", "AP-REQ");
+ return asn1_new (handle, "Kerberos5.AP-REQ", "AP-REQ");
}
/**
@@ -470,7 +471,7 @@
Shishi_asn1
shishi_asn1_aprep (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.AP-REP", "AP-REP");
+ return asn1_new (handle, "Kerberos5.AP-REP", "AP-REP");
}
/**
@@ -484,7 +485,7 @@
Shishi_asn1
shishi_asn1_encapreppart (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.EncAPRepPart", "EncAPRepPart");
+ return asn1_new (handle, "Kerberos5.EncAPRepPart", "EncAPRepPart");
}
/**
@@ -498,7 +499,7 @@
Shishi_asn1
shishi_asn1_ticket (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.Ticket", "Ticket");
+ return asn1_new (handle, "Kerberos5.Ticket", "Ticket");
}
/**
@@ -512,7 +513,7 @@
Shishi_asn1
shishi_asn1_encticketpart (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.EncTicketPart", "EncTicketPart");
+ return asn1_new (handle, "Kerberos5.EncTicketPart", "EncTicketPart");
}
/**
@@ -526,7 +527,7 @@
Shishi_asn1
shishi_asn1_authenticator (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.Authenticator", "Authenticator");
+ return asn1_new (handle, "Kerberos5.Authenticator", "Authenticator");
}
/**
@@ -540,7 +541,7 @@
Shishi_asn1
shishi_asn1_enckdcreppart (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.EncKDCRepPart", "EncKDCRepPart");
+ return asn1_new (handle, "Kerberos5.EncKDCRepPart", "EncKDCRepPart");
}
/**
@@ -554,7 +555,7 @@
Shishi_asn1
shishi_asn1_encasreppart (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.EncASRepPart", "EncKDCRepPart");
+ return asn1_new (handle, "Kerberos5.EncASRepPart", "EncKDCRepPart");
}
/**
@@ -568,7 +569,7 @@
Shishi_asn1
shishi_asn1_krberror (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.KRB-ERROR", "KRB-ERROR");
+ return asn1_new (handle, "Kerberos5.KRB-ERROR", "KRB-ERROR");
}
/**
@@ -582,7 +583,7 @@
Shishi_asn1
shishi_asn1_krbsafe (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.KRB-SAFE", "KRB-SAFE");
+ return asn1_new (handle, "Kerberos5.KRB-SAFE", "KRB-SAFE");
}
/**
@@ -596,7 +597,7 @@
Shishi_asn1
shishi_asn1_priv (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.KRB-PRIV", "KRB-PRIV");
+ return asn1_new (handle, "Kerberos5.KRB-PRIV", "KRB-PRIV");
}
/**
@@ -610,43 +611,26 @@
Shishi_asn1
shishi_asn1_encprivpart (Shishi * handle)
{
- return shishi_asn1_new (handle, "Kerberos5.EncKrbPrivPart",
- "EncKrbPrivPart");
+ return asn1_new (handle, "Kerberos5.EncKrbPrivPart", "EncKrbPrivPart");
}
-/* XXX obsolete */
-int
-shishi_a2d_field (Shishi * handle,
- Shishi_asn1 node, const char *field,
- char *der, size_t * len)
-{
- char errorDescription[MAX_ERROR_DESCRIPTION_SIZE] = "";
- int tmplen = *len;
- int rc;
-
- rc = asn1_der_coding (node, field, (unsigned char *) der, &tmplen,
- errorDescription);
- *len = tmplen;
- if (rc != ASN1_SUCCESS)
- {
- shishi_error_set (handle, errorDescription);
- return SHISHI_ASN1_ERROR;
- }
-
- return SHISHI_OK;
-}
-
-/* XXX obsolete */
-int
-shishi_a2d (Shishi * handle, Shishi_asn1 node, char *der, size_t * len)
-{
- return shishi_a2d_field (handle, node, "", der, len);
-}
-
-/* XXX rename and docuemnt */
+/**
+ * shishi_asn1_to_der_field:
+ * @handle: shishi handle as allocated by shishi_init().
+ * @node: ASN.1 data that have field to extract.
+ * @field: name of field in @node to extract.
+ * @der: output array that holds DER encoding of @field in @node.
+ * @len: output variable with length of @der output array.
+ *
+ * Extract newly allocated DER representation of specified ASN.1 field.
+ *
+ * Return value: Returns SHISHI_OK if successful, or SHISHI_ASN1_ERROR
+ * if DER encoding fails (common reasons for this is that the ASN.1
+ * is missing required values).
+ **/
int
-shishi_a2d_new_field (Shishi * handle, Shishi_asn1 node,
- const char *field, char **der, size_t * len)
+shishi_asn1_to_der_field (Shishi * handle, Shishi_asn1 node,
+ const char *field, char **der, size_t * len)
{
char errorDescription[MAX_ERROR_DESCRIPTION_SIZE] = "";
int mylen = 0;
@@ -673,11 +657,24 @@
return SHISHI_OK;
}
-/* XXX rename and docuemnt */
+/**
+ * shishi_asn1_to_der:
+ * @handle: shishi handle as allocated by shishi_init().
+ * @node: ASN.1 data to convert to DER.
+ * @der: output array that holds DER encoding of @node.
+ * @len: output variable with length of @der output array.
+ *
+ * Extract newly allocated DER representation of specified ASN.1 data.
+ *
+ * Return value: Returns SHISHI_OK if successful, or SHISHI_ASN1_ERROR
+ * if DER encoding fails (common reasons for this is that the ASN.1
+ * is missing required values).
+ **/
int
-shishi_new_a2d (Shishi * handle, Shishi_asn1 node, char **der, size_t * len)
+shishi_asn1_to_der (Shishi * handle, Shishi_asn1 node, char **der,
+ size_t * len)
{
- return shishi_a2d_new_field (handle, node, "", der, len);
+ return shishi_asn1_to_der_field (handle, node, "", der, len);
}
static Shishi_asn1
--- /home/cvs/shishi/lib/asn1.h 2003/12/21 13:56:25 1.1
+++ /home/cvs/shishi/lib/asn1.h 2004/09/10 09:04:16 1.2
@@ -1,5 +1,5 @@
/* asn1.h --- Utilities to manipulate RFC 1510 ASN.1 types.
- * Copyright (C) 2002, 2003 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004 Simon Josefsson
*
* This file is part of Shishi.
*
@@ -20,7 +20,3 @@
*/
extern int _shishi_asn1_init (Shishi * handle);
-extern Shishi_asn1 _shishi_asn1_read (void);
-extern int shishi_asn1_integer2_field (Shishi * handle,
- Shishi_asn1 node, unsigned long *i,
- const char *field);
--- /home/cvs/shishi/lib/diskio.c 2004/04/18 09:03:21 1.40
+++ /home/cvs/shishi/lib/diskio.c 2004/09/10 09:04:16 1.41
@@ -51,7 +51,7 @@
asn1_print_structure (fh, asn1, "", ASN1_PRINT_NAME_TYPE_VALUE);
- res = shishi_new_a2d (handle, asn1, &der, &derlen);
+ res = shishi_asn1_to_der (handle, asn1, &der, &derlen);
if (res != ASN1_SUCCESS)
{
shishi_error_printf (handle, "Could not DER encode %s: %s\n",
@@ -92,8 +92,7 @@
int res;
size_t i;
- derlen = sizeof (der);
- res = shishi_a2d_new_field (handle, asn1, asn1type, &der, &derlen);
+ res = shishi_asn1_to_der_field (handle, asn1, asn1type, &der, &derlen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not DER encode %s: %s\n",
--- /home/cvs/shishi/lib/kdc.c 2004/04/18 09:33:33 1.59
+++ /home/cvs/shishi/lib/kdc.c 2004/09/10 09:04:16 1.60
@@ -118,7 +118,7 @@
size_t realmlen;
int res;
- res = shishi_new_a2d (handle, kdcreq, &der, &der_len);
+ res = shishi_asn1_to_der (handle, kdcreq, &der, &der_len);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not DER encode AS-REQ: %s\n",
--- /home/cvs/shishi/lib/kdcrep.c 2004/04/18 13:36:59 1.42
+++ /home/cvs/shishi/lib/kdcrep.c 2004/09/10 09:04:16 1.43
@@ -673,7 +673,7 @@
char *der;
size_t derlen;
- res = shishi_new_a2d (handle, enckdcreppart, &der, &derlen);
+ res = shishi_asn1_to_der (handle, enckdcreppart, &der, &derlen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not DER encode enckdcreppart: %s\n",
--- /home/cvs/shishi/lib/kdcreq.c 2004/09/08 12:58:48 1.65
+++ /home/cvs/shishi/lib/kdcreq.c 2004/09/10 09:04:16 1.66
@@ -1285,7 +1285,7 @@
char *data;
size_t datalen;
- res = shishi_new_a2d (handle, apreq, &data, &datalen);
+ res = shishi_asn1_to_der (handle, apreq, &data, &datalen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not DER encode AP-REQ: %s\n",
--- /home/cvs/shishi/lib/krberror.c 2004/08/01 18:08:45 1.32
+++ /home/cvs/shishi/lib/krberror.c 2004/09/10 09:04:16 1.33
@@ -399,7 +399,7 @@
if (rc != SHISHI_OK)
return rc;
- rc = shishi_new_a2d (handle, krberror, out, outlen);
+ rc = shishi_asn1_to_der (handle, krberror, out, outlen);
if (rc != SHISHI_OK)
return rc;
--- /home/cvs/shishi/lib/priv.c 2004/04/18 13:36:59 1.5
+++ /home/cvs/shishi/lib/priv.c 2004/09/10 09:04:16 1.6
@@ -202,7 +202,7 @@
{
int rc;
- rc = shishi_new_a2d (priv->handle, priv->priv, out, outlen);
+ rc = shishi_asn1_to_der (priv->handle, priv->priv, out, outlen);
if (rc != SHISHI_OK)
return rc;
@@ -281,7 +281,7 @@
{
int rc;
- rc = shishi_new_a2d (priv->handle, priv->encprivpart, out, outlen);
+ rc = shishi_asn1_to_der (priv->handle, priv->encprivpart, out, outlen);
if (rc != SHISHI_OK)
return rc;
@@ -600,7 +600,7 @@
char *der;
size_t derlen;
- res = shishi_new_a2d (priv->handle, priv->encprivpart, &der, &derlen);
+ res = shishi_asn1_to_der (priv->handle, priv->encprivpart, &der, &derlen);
if (res != SHISHI_OK)
{
shishi_error_printf (priv->handle,
--- /home/cvs/shishi/lib/safe.c 2004/04/18 13:36:59 1.27
+++ /home/cvs/shishi/lib/safe.c 2004/09/10 09:04:16 1.28
@@ -190,7 +190,7 @@
{
int rc;
- rc = shishi_new_a2d (safe->handle, safe->safe, out, outlen);
+ rc = shishi_asn1_to_der (safe->handle, safe->safe, out, outlen);
if (rc != SHISHI_OK)
return rc;
--- /home/cvs/shishi/lib/shishi.h.in 2004/08/01 18:11:45 1.234
+++ /home/cvs/shishi/lib/shishi.h.in 2004/09/10 09:04:16 1.235
@@ -1539,16 +1539,12 @@
shishi_prompt_password (Shishi * handle, char **s, const char *format, ...);
/* asn1.c */
-extern int shishi_a2d_field (Shishi * handle,
- Shishi_asn1 node,
- const char *field, char *der, size_t * len);
-extern int shishi_a2d (Shishi * handle, Shishi_asn1 node,
- char *der, size_t * len);
-extern int shishi_a2d_new_field (Shishi * handle, Shishi_asn1 node,
- const char *field, char **der, size_t * len);
-extern int shishi_new_a2d (Shishi * handle, Shishi_asn1 node,
- char **der, size_t * len);
-extern void shishi_asn1_done (Shishi * handle, Shishi_asn1 node);
+extern int shishi_asn1_number_of_elements (Shishi * handle,
+ Shishi_asn1 node,
+ const char *field, size_t * n);
+extern int shishi_asn1_empty_p (Shishi * handle, Shishi_asn1 node,
+ const char *field);
+
extern int shishi_asn1_read (Shishi * handle, Shishi_asn1 node,
const char *field, char *data, size_t * datalen);
extern int shishi_asn1_read2 (Shishi * handle, Shishi_asn1 node,
@@ -1568,8 +1564,7 @@
extern int shishi_asn1_read2_optional (Shishi * handle,
Shishi_asn1 node, const char *field,
char **data, size_t * datalen);
-extern int shishi_asn1_empty_p (Shishi * handle, Shishi_asn1 node,
- const char *field);
+
extern int shishi_asn1_write (Shishi * handle, Shishi_asn1 node,
const char *field,
const char *data, size_t datalen);
@@ -1581,9 +1576,9 @@
const char *field, uint32_t n);
extern int shishi_asn1_write_bitstring (Shishi * handle, Shishi_asn1 node,
const char *field, uint32_t flags);
-extern int shishi_asn1_number_of_elements (Shishi * handle,
- Shishi_asn1 node,
- const char *field, size_t * n);
+
+extern void shishi_asn1_done (Shishi * handle, Shishi_asn1 node);
+
extern Shishi_asn1 shishi_asn1_asreq (Shishi * handle);
extern Shishi_asn1 shishi_asn1_asrep (Shishi * handle);
extern Shishi_asn1 shishi_asn1_tgsreq (Shishi * handle);
@@ -1601,6 +1596,11 @@
extern Shishi_asn1 shishi_asn1_priv (Shishi * handle);
extern Shishi_asn1 shishi_asn1_encprivpart (Shishi * handle);
+extern int shishi_asn1_to_der (Shishi * handle, Shishi_asn1 node,
+ char **der, size_t * len);
+extern int shishi_asn1_to_der_field (Shishi * handle, Shishi_asn1 node,
+ const char *field, char **der, size_t *
len);
+
extern Shishi_msgtype shishi_asn1_msgtype (Shishi * handle, Shishi_asn1 node);
extern Shishi_msgtype shishi_der_msgtype (Shishi * handle,
const char *der, size_t derlen);
--- /home/cvs/shishi/lib/tgs.c 2004/04/18 09:43:37 1.37
+++ /home/cvs/shishi/lib/tgs.c 2004/09/10 09:04:16 1.38
@@ -193,7 +193,7 @@
{
int rc;
- rc = shishi_new_a2d (tgs->handle, tgs->tgsreq, out, outlen);
+ rc = shishi_asn1_to_der (tgs->handle, tgs->tgsreq, out, outlen);
if (rc != SHISHI_OK)
return rc;
@@ -350,7 +350,7 @@
{
int rc;
- rc = shishi_new_a2d (tgs->handle, tgs->tgsrep, out, outlen);
+ rc = shishi_asn1_to_der (tgs->handle, tgs->tgsrep, out, outlen);
if (rc != SHISHI_OK)
return rc;
--- /home/cvs/shishi/lib/ticket.c 2003/12/27 23:48:51 1.53
+++ /home/cvs/shishi/lib/ticket.c 2004/09/10 09:04:16 1.54
@@ -381,7 +381,7 @@
char *der;
size_t derlen;
- res = shishi_new_a2d (handle, encticketpart, &der, &derlen);
+ res = shishi_asn1_to_der (handle, encticketpart, &der, &derlen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not DER encode encticketpart: %s\n",
- CVS shishi/lib, shishi-commit, 2004/09/02
- CVS shishi/lib, shishi-commit, 2004/09/02
- CVS shishi/lib, shishi-commit, 2004/09/02
- CVS shishi/lib, shishi-commit, 2004/09/06
- CVS shishi/lib, shishi-commit, 2004/09/08
- CVS shishi/lib, shishi-commit, 2004/09/08
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib,
shishi-commit <=
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17