projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an evil cast, because POSIX/SUSv2 define connect(2) require
[oweals/openssl.git]
/
crypto
/
asn1
/
t_pkey.c
diff --git
a/crypto/asn1/t_pkey.c
b/crypto/asn1/t_pkey.c
index bc518d59a26e8418cd21588e8e7f31b08a29c53e..e570ed1c473804f0b6bb705cfcabf7f54bb4bf46 100644
(file)
--- a/
crypto/asn1/t_pkey.c
+++ b/
crypto/asn1/t_pkey.c
@@
-58,35
+58,23
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"buffer.h"
-#include
"bn.h"
+#include
<openssl/buffer.h>
+#include
<openssl/bn.h>
#ifndef NO_RSA
#ifndef NO_RSA
-#include
"rsa.h"
+#include
<openssl/rsa.h>
#endif
#ifndef NO_DH
#endif
#ifndef NO_DH
-#include
"dh.h"
+#include
<openssl/dh.h>
#endif
#ifndef NO_DSA
#endif
#ifndef NO_DSA
-#include
"dsa.h"
+#include
<openssl/dsa.h>
#endif
#endif
-/* DHerr(DH_F_DHPARAMS_PRINT,ERR_R_MALLOC_FAILURE);
- * DSAerr(DSA_F_DSAPARAMS_PRINT,ERR_R_MALLOC_FAILURE);
- */
-
-#ifndef NOPROTO
-static int print(BIO *fp,char *str,BIGNUM *num,
+static int print(BIO *fp,const char *str,BIGNUM *num,
unsigned char *buf,int off);
unsigned char *buf,int off);
-#else
-static int print();
-#endif
-
#ifndef NO_RSA
#ifndef NO_FP_API
#ifndef NO_RSA
#ifndef NO_FP_API
-int RSA_print_fp(fp,x,off)
-FILE *fp;
-RSA *x;
-int off;
+int RSA_print_fp(FILE *fp, RSA *x, int off)
{
BIO *b;
int ret;
{
BIO *b;
int ret;
@@
-103,12
+91,10
@@
int off;
}
#endif
}
#endif
-int RSA_print(bp,x,off)
-BIO *bp;
-RSA *x;
-int off;
+int RSA_print(BIO *bp, RSA *x, int off)
{
{
- char str[128],*s;
+ char str[128];
+ const char *s;
unsigned char *m=NULL;
int i,ret=0;
unsigned char *m=NULL;
int i,ret=0;
@@
-147,17
+133,14
@@
int off;
if (!print(bp,"coefficient:",x->iqmp,m,off)) goto err;
ret=1;
err:
if (!print(bp,"coefficient:",x->iqmp,m,off)) goto err;
ret=1;
err:
- if (m != NULL) Free(
(char *)
m);
+ if (m != NULL) Free(m);
return(ret);
}
#endif /* NO_RSA */
#ifndef NO_DSA
#ifndef NO_FP_API
return(ret);
}
#endif /* NO_RSA */
#ifndef NO_DSA
#ifndef NO_FP_API
-int DSA_print_fp(fp,x,off)
-FILE *fp;
-DSA *x;
-int off;
+int DSA_print_fp(FILE *fp, DSA *x, int off)
{
BIO *b;
int ret;
{
BIO *b;
int ret;
@@
-174,10
+157,7
@@
int off;
}
#endif
}
#endif
-int DSA_print(bp,x,off)
-BIO *bp;
-DSA *x;
-int off;
+int DSA_print(BIO *bp, DSA *x, int off)
{
char str[128];
unsigned char *m=NULL;
{
char str[128];
unsigned char *m=NULL;
@@
-224,20
+204,17
@@
int off;
if ((x->g != NULL) && !print(bp,"G: ",x->g,m,off)) goto err;
ret=1;
err:
if ((x->g != NULL) && !print(bp,"G: ",x->g,m,off)) goto err;
ret=1;
err:
- if (m != NULL) Free(
(char *)
m);
+ if (m != NULL) Free(m);
return(ret);
}
#endif /* !NO_DSA */
return(ret);
}
#endif /* !NO_DSA */
-static int print(bp,number,num,buf,off)
-BIO *bp;
-char *number;
-BIGNUM *num;
-unsigned char *buf;
-int off;
+static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
+ int off)
{
int n,i;
{
int n,i;
- char str[128],*neg;
+ char str[128];
+ const char *neg;
if (num == NULL) return(1);
neg=(num->neg)?"-":"";
if (num == NULL) return(1);
neg=(num->neg)?"-":"";
@@
-284,9
+261,7
@@
int off;
#ifndef NO_DH
#ifndef NO_FP_API
#ifndef NO_DH
#ifndef NO_FP_API
-int DHparams_print_fp(fp,x)
-FILE *fp;
-DH *x;
+int DHparams_print_fp(FILE *fp, DH *x)
{
BIO *b;
int ret;
{
BIO *b;
int ret;
@@
-303,9
+278,7
@@
DH *x;
}
#endif
}
#endif
-int DHparams_print(bp,x)
-BIO *bp;
-DH *x;
+int DHparams_print(BIO *bp, DH *x)
{
unsigned char *m=NULL;
int reason=ERR_R_BUF_LIB,i,ret=0;
{
unsigned char *m=NULL;
int reason=ERR_R_BUF_LIB,i,ret=0;
@@
-325,7
+298,7
@@
DH *x;
if (!print(bp,"generator:",x->g,m,4)) goto err;
if (x->length != 0)
{
if (!print(bp,"generator:",x->g,m,4)) goto err;
if (x->length != 0)
{
- if (BIO_printf(bp," recom
ent
ed-private-length: %d bits\n",
+ if (BIO_printf(bp," recom
mend
ed-private-length: %d bits\n",
(int)x->length) <= 0) goto err;
}
ret=1;
(int)x->length) <= 0) goto err;
}
ret=1;
@@
-334,16
+307,14
@@
DH *x;
err:
DHerr(DH_F_DHPARAMS_PRINT,reason);
}
err:
DHerr(DH_F_DHPARAMS_PRINT,reason);
}
- if (m != NULL) Free(
(char *)
m);
+ if (m != NULL) Free(m);
return(ret);
}
#endif
#ifndef NO_DSA
#ifndef NO_FP_API
return(ret);
}
#endif
#ifndef NO_DSA
#ifndef NO_FP_API
-int DSAparams_print_fp(fp,x)
-FILE *fp;
-DSA *x;
+int DSAparams_print_fp(FILE *fp, DSA *x)
{
BIO *b;
int ret;
{
BIO *b;
int ret;
@@
-360,9
+331,7
@@
DSA *x;
}
#endif
}
#endif
-int DSAparams_print(bp,x)
-BIO *bp;
-DSA *x;
+int DSAparams_print(BIO *bp, DSA *x)
{
unsigned char *m=NULL;
int reason=ERR_R_BUF_LIB,i,ret=0;
{
unsigned char *m=NULL;
int reason=ERR_R_BUF_LIB,i,ret=0;
@@
-383,7
+352,7
@@
DSA *x;
if (!print(bp,"g:",x->g,m,4)) goto err;
ret=1;
err:
if (!print(bp,"g:",x->g,m,4)) goto err;
ret=1;
err:
- if (m != NULL) Free(
(char *)
m);
+ if (m != NULL) Free(m);
DSAerr(DSA_F_DSAPARAMS_PRINT,reason);
return(ret);
}
DSAerr(DSA_F_DSAPARAMS_PRINT,reason);
return(ret);
}