diff options
| author | Tom Yu <tlyu@mit.edu> | 2009-03-31 23:51:48 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2009-03-31 23:51:48 +0000 |
| commit | 24c4a63e12354d797d0ab02d6b9bc2d9044f74b4 (patch) | |
| tree | 30c2bc75c827920268ab7d44a00beedf9055b1d4 /src/lib/krb5/asn.1/krb5_encode.c | |
| parent | d92f1f050e4124cdeb5e7f192b677c7aa9a62562 (diff) | |
| download | krb5-24c4a63e12354d797d0ab02d6b9bc2d9044f74b4.tar.gz krb5-24c4a63e12354d797d0ab02d6b9bc2d9044f74b4.tar.xz krb5-24c4a63e12354d797d0ab02d6b9bc2d9044f74b4.zip | |
Make FAST changes build when pkinit is disabled
ticket: 6436
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22153 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/asn.1/krb5_encode.c')
| -rw-r--r-- | src/lib/krb5/asn.1/krb5_encode.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c index a8ac06a54b..5834e8ae84 100644 --- a/src/lib/krb5/asn.1/krb5_encode.c +++ b/src/lib/krb5/asn.1/krb5_encode.c @@ -34,7 +34,6 @@ /**************** Macros (these save a lot of typing) ****************/ -#ifndef DISABLE_PKINIT /* setup() -- create and initialize bookkeeping variables retval: stores error codes returned from subroutines buf: the coding buffer @@ -63,6 +62,7 @@ error:\ *code = tmpcode;\ return 0 +#ifndef DISABLE_PKINIT krb5_error_code encode_krb5_pa_pk_as_req(const krb5_pa_pk_as_req *rep, krb5_data **code) { krb5_setup(); @@ -153,21 +153,22 @@ krb5_error_code encode_krb5_td_trusted_certifiers(const krb5_external_principal_ krb5_cleanup(); } -krb5_error_code encode_krb5_typed_data(const krb5_typed_data **rep, krb5_data **code) +krb5_error_code encode_krb5_td_dh_parameters(const krb5_algorithm_identifier **rep, krb5_data **code) { krb5_setup(); - retval = asn1_encode_sequence_of_typed_data(buf,rep,&length); + retval = asn1_encode_sequence_of_algorithm_identifier(buf,rep,&length); if (retval) goto error; sum += length; krb5_cleanup(); } +#endif /* DISABLE_PKINIT */ -krb5_error_code encode_krb5_td_dh_parameters(const krb5_algorithm_identifier **rep, krb5_data **code) +krb5_error_code encode_krb5_typed_data(const krb5_typed_data **rep, krb5_data **code) { krb5_setup(); - retval = asn1_encode_sequence_of_algorithm_identifier(buf,rep,&length); + retval = asn1_encode_sequence_of_typed_data(buf,rep,&length); if (retval) goto error; sum += length; krb5_cleanup(); } -#endif /* DISABLE_PKINIT */ + |