generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extend callback function to support print customization.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2005-09-01 20:42:52 +00:00
parent 5abe32d861
commit 244847591f
15 changed files with 58 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/asn1/asn1t.h
View File

@ -3,7 +3,7 @@
* project 2000. * project 2000.
*/ */
/* ==================================================================== /* ====================================================================
* Copyright (c) 2000 The OpenSSL Project. All rights reserved. * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -695,7 +695,8 @@ typedef struct ASN1_PRIMITIVE_FUNCS_st {
* then an external type is more appropriate. * then an external type is more appropriate.
*/ */
typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it); typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it,
void *exarg);
typedef struct ASN1_AUX_st { typedef struct ASN1_AUX_st {
void *app_data; void *app_data;
@ -706,6 +707,13 @@ typedef struct ASN1_AUX_st {
int enc_offset; /* Offset of ASN1_ENCODING structure */ int enc_offset; /* Offset of ASN1_ENCODING structure */
} ASN1_AUX; } ASN1_AUX;
/* For print related callbacks exarg points to this structure */
typedef struct ASN1_PRINT_ARG_st {
BIO *out;
int indent;
ASN1_PCTX *pctx;
} ASN1_PRINT_ARG;
/* Flags in ASN1_AUX */ /* Flags in ASN1_AUX */
/* Use a reference count */ /* Use a reference count */
@ -725,6 +733,8 @@ typedef struct ASN1_AUX_st {
#define ASN1_OP_D2I_POST 5 #define ASN1_OP_D2I_POST 5
#define ASN1_OP_I2D_PRE 6 #define ASN1_OP_I2D_PRE 6
#define ASN1_OP_I2D_POST 7 #define ASN1_OP_I2D_POST 7
#define ASN1_OP_PRINT_PRE 8
#define ASN1_OP_PRINT_POST 9
/* Macro to implement a primitive type */ /* Macro to implement a primitive type */
#define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0) #define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)

5
crypto/asn1/nsseq.c
View File

@ -3,7 +3,7 @@
* project 1999. * project 1999.
*/ */
/* ==================================================================== /* ====================================================================
* Copyright (c) 1999 The OpenSSL Project. All rights reserved. * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -62,7 +62,8 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/objects.h> #include <openssl/objects.h>
static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if(operation == ASN1_OP_NEW_POST) { if(operation == ASN1_OP_NEW_POST) {
NETSCAPE_CERT_SEQUENCE *nsseq; NETSCAPE_CERT_SEQUENCE *nsseq;

5
crypto/asn1/p8_pkey.c
View File

@ -3,7 +3,7 @@
* project 1999. * project 1999.
*/ */
/* ==================================================================== /* ====================================================================
* Copyright (c) 1999 The OpenSSL Project. All rights reserved. * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -62,7 +62,8 @@
#include <openssl/x509.h> #include <openssl/x509.h>
/* Minor tweak to operation: zero private key data */ /* Minor tweak to operation: zero private key data */
static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
/* Since the structure must still be valid use ASN1_OP_FREE_PRE */ /* Since the structure must still be valid use ASN1_OP_FREE_PRE */
if(operation == ASN1_OP_FREE_PRE) { if(operation == ASN1_OP_FREE_PRE) {

8
crypto/asn1/tasn_dec.c
View File

@ -300,7 +300,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
case ASN1_ITYPE_CHOICE: case ASN1_ITYPE_CHOICE:
if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
goto auxerr; goto auxerr;
/* Allocate structure */ /* Allocate structure */
@ -350,7 +350,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
asn1_set_choice_selector(pval, i, it); asn1_set_choice_selector(pval, i, it);
*in = p; *in = p;
if (asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it, NULL))
goto auxerr; goto auxerr;
return 1; return 1;
@ -397,7 +397,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
goto err; goto err;
} }
if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
goto auxerr; goto auxerr;
/* Get each field entry */ /* Get each field entry */
@ -499,7 +499,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
if (!asn1_enc_save(pval, *in, p - *in, it)) if (!asn1_enc_save(pval, *in, p - *in, it))
goto auxerr; goto auxerr;
*in = p; *in = p;
if (asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it, NULL))
goto auxerr; goto auxerr;
return 1; return 1;

8
crypto/asn1/tasn_enc.c
View File

@ -157,7 +157,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
return asn1_i2d_ex_primitive(pval, out, it, -1, aclass); return asn1_i2d_ex_primitive(pval, out, it, -1, aclass);
case ASN1_ITYPE_CHOICE: case ASN1_ITYPE_CHOICE:
if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it, NULL))
return 0; return 0;
i = asn1_get_choice_selector(pval, it); i = asn1_get_choice_selector(pval, it);
if ((i >= 0) && (i < it->tcount)) if ((i >= 0) && (i < it->tcount))
@ -170,7 +170,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-1, aclass); -1, aclass);
} }
/* Fixme: error condition if selector out of range */ /* Fixme: error condition if selector out of range */
if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it, NULL))
return 0; return 0;
break; break;
@ -215,7 +215,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
aclass = (aclass & ~ASN1_TFLG_TAG_CLASS) aclass = (aclass & ~ASN1_TFLG_TAG_CLASS)
| V_ASN1_UNIVERSAL; | V_ASN1_UNIVERSAL;
} }
if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it, NULL))
return 0; return 0;
/* First work out sequence content length */ /* First work out sequence content length */
for (i = 0, tt = it->templates; i < it->tcount; tt++, i++) for (i = 0, tt = it->templates; i < it->tcount; tt++, i++)
@ -249,7 +249,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
} }
if (ndef == 2) if (ndef == 2)
ASN1_put_eoc(out); ASN1_put_eoc(out);
if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it, NULL))
return 0; return 0;
return seqlen; return seqlen;

10
crypto/asn1/tasn_fre.c
View File

@ -110,13 +110,13 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
case ASN1_ITYPE_CHOICE: case ASN1_ITYPE_CHOICE:
if (asn1_cb) if (asn1_cb)
{ {
i = asn1_cb(ASN1_OP_FREE_PRE, pval, it); i = asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL);
if (i == 2) if (i == 2)
return; return;
} }
i = asn1_get_choice_selector(pval, it); i = asn1_get_choice_selector(pval, it);
if (asn1_cb) if (asn1_cb)
asn1_cb(ASN1_OP_FREE_PRE, pval, it); asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL);
if ((i >= 0) && (i < it->tcount)) if ((i >= 0) && (i < it->tcount))
{ {
ASN1_VALUE **pchval; ASN1_VALUE **pchval;
@ -125,7 +125,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
ASN1_template_free(pchval, tt); ASN1_template_free(pchval, tt);
} }
if (asn1_cb) if (asn1_cb)
asn1_cb(ASN1_OP_FREE_POST, pval, it); asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
if (!combine) if (!combine)
{ {
OPENSSL_free(*pval); OPENSSL_free(*pval);
@ -151,7 +151,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
return; return;
if (asn1_cb) if (asn1_cb)
{ {
i = asn1_cb(ASN1_OP_FREE_PRE, pval, it); i = asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL);
if (i == 2) if (i == 2)
return; return;
} }
@ -172,7 +172,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
ASN1_template_free(pseqval, seqtt); ASN1_template_free(pseqval, seqtt);
} }
if (asn1_cb) if (asn1_cb)
asn1_cb(ASN1_OP_FREE_POST, pval, it); asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
if (!combine) if (!combine)
{ {
OPENSSL_free(*pval); OPENSSL_free(*pval);

8
crypto/asn1/tasn_new.c
View File

@ -146,7 +146,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
case ASN1_ITYPE_CHOICE: case ASN1_ITYPE_CHOICE:
if (asn1_cb) if (asn1_cb)
{ {
i = asn1_cb(ASN1_OP_NEW_PRE, pval, it); i = asn1_cb(ASN1_OP_NEW_PRE, pval, it, NULL);
if (!i) if (!i)
goto auxerr; goto auxerr;
if (i==2) if (i==2)
@ -166,7 +166,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
memset(*pval, 0, it->size); memset(*pval, 0, it->size);
} }
asn1_set_choice_selector(pval, -1, it); asn1_set_choice_selector(pval, -1, it);
if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it, NULL))
goto auxerr; goto auxerr;
break; break;
@ -174,7 +174,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
case ASN1_ITYPE_SEQUENCE: case ASN1_ITYPE_SEQUENCE:
if (asn1_cb) if (asn1_cb)
{ {
i = asn1_cb(ASN1_OP_NEW_PRE, pval, it); i = asn1_cb(ASN1_OP_NEW_PRE, pval, it, NULL);
if (!i) if (!i)
goto auxerr; goto auxerr;
if (i==2) if (i==2)
@ -201,7 +201,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
if (!ASN1_template_new(pseqval, tt)) if (!ASN1_template_new(pseqval, tt))
goto memerr; goto memerr;
} }
if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it)) if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it, NULL))
goto auxerr; goto auxerr;
break; break;
} }

3
crypto/asn1/x_crl.c
View File

@ -74,7 +74,8 @@ ASN1_SEQUENCE(X509_REVOKED) = {
* Since we cache the original encoding the signature wont be affected by * Since we cache the original encoding the signature wont be affected by
* reordering of the revoked field. * reordering of the revoked field.
*/ */
static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
X509_CRL_INFO *a = (X509_CRL_INFO *)*pval; X509_CRL_INFO *a = (X509_CRL_INFO *)*pval;

3
crypto/asn1/x_pubkey.c
View File

@ -68,7 +68,8 @@
#endif #endif
/* Minor tweak to operation: free up EVP_PKEY */ /* Minor tweak to operation: free up EVP_PKEY */
static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if (operation == ASN1_OP_FREE_POST) if (operation == ASN1_OP_FREE_POST)
{ {

3
crypto/asn1/x_req.c
View File

@ -79,7 +79,8 @@
* *
*/ */
static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
X509_REQ_INFO *rinf = (X509_REQ_INFO *)*pval; X509_REQ_INFO *rinf = (X509_REQ_INFO *)*pval;

3
crypto/asn1/x_x509.c
View File

@ -81,7 +81,8 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CINF)
extern void policy_cache_free(X509_POLICY_CACHE *cache); extern void policy_cache_free(X509_POLICY_CACHE *cache);
static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
X509 *ret = (X509 *)*pval; X509 *ret = (X509 *)*pval;

5
crypto/dh/dh_asn1.c
View File

@ -3,7 +3,7 @@
* project 2000. * project 2000.
*/ */
/* ==================================================================== /* ====================================================================
* Copyright (c) 2000 The OpenSSL Project. All rights reserved. * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -64,7 +64,8 @@
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
/* Override the default free and new methods */ /* Override the default free and new methods */
static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if(operation == ASN1_OP_NEW_PRE) { if(operation == ASN1_OP_NEW_PRE) {
*pval = (ASN1_VALUE *)DH_new(); *pval = (ASN1_VALUE *)DH_new();

8
crypto/dsa/dsa_asn1.c
View File

@ -3,7 +3,7 @@
* project 2000. * project 2000.
*/ */
/* ==================================================================== /* ====================================================================
* Copyright (c) 2000 The OpenSSL Project. All rights reserved. * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -63,7 +63,8 @@
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
/* Override the default new methods */ /* Override the default new methods */
static int sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if(operation == ASN1_OP_NEW_PRE) { if(operation == ASN1_OP_NEW_PRE) {
DSA_SIG *sig; DSA_SIG *sig;
@ -86,7 +87,8 @@ ASN1_SEQUENCE_cb(DSA_SIG, sig_cb) = {
IMPLEMENT_ASN1_FUNCTIONS_const(DSA_SIG) IMPLEMENT_ASN1_FUNCTIONS_const(DSA_SIG)
/* Override the default free and new methods */ /* Override the default free and new methods */
static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if(operation == ASN1_OP_NEW_PRE) { if(operation == ASN1_OP_NEW_PRE) {
*pval = (ASN1_VALUE *)DSA_new(); *pval = (ASN1_VALUE *)DSA_new();

6
crypto/pkcs7/pk7_asn1.c
View File

@ -98,7 +98,8 @@ ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = {
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNED) IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNED)
/* Minor tweak to operation: free up EVP_PKEY */ /* Minor tweak to operation: free up EVP_PKEY */
static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if(operation == ASN1_OP_FREE_POST) { if(operation == ASN1_OP_FREE_POST) {
PKCS7_SIGNER_INFO *si = (PKCS7_SIGNER_INFO *)*pval; PKCS7_SIGNER_INFO *si = (PKCS7_SIGNER_INFO *)*pval;
@ -140,7 +141,8 @@ ASN1_NDEF_SEQUENCE(PKCS7_ENVELOPE) = {
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENVELOPE) IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
/* Minor tweak to operation: free up X509 */ /* Minor tweak to operation: free up X509 */
static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if(operation == ASN1_OP_FREE_POST) { if(operation == ASN1_OP_FREE_POST) {
PKCS7_RECIP_INFO *ri = (PKCS7_RECIP_INFO *)*pval; PKCS7_RECIP_INFO *ri = (PKCS7_RECIP_INFO *)*pval;

5
crypto/rsa/rsa_asn1.c
View File

@ -3,7 +3,7 @@
* project 2000. * project 2000.
*/ */
/* ==================================================================== /* ====================================================================
* Copyright (c) 2000 The OpenSSL Project. All rights reserved. * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -63,7 +63,8 @@
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
/* Override the default free and new methods */ /* Override the default free and new methods */
static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg)
{ {
if(operation == ASN1_OP_NEW_PRE) { if(operation == ASN1_OP_NEW_PRE) {
*pval = (ASN1_VALUE *)RSA_new(); *pval = (ASN1_VALUE *)RSA_new();