From 4d524e10b4853436a1bfbc83822c5d0e87d64fbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulf=20M=C3=B6ller?= Date: Thu, 24 Feb 2000 11:55:57 +0000 Subject: [PATCH] nicer manpages --- INSTALL | 5 ++-- NEWS | 3 +- doc/apps/version.pod | 2 +- doc/crypto/BN_add.pod | 2 +- doc/crypto/BN_add_word.pod | 2 +- doc/crypto/BN_bn2bin.pod | 2 +- doc/crypto/BN_generate_prime.pod | 2 +- doc/crypto/BN_mod_inverse.pod | 5 ++-- doc/crypto/BN_mod_mul_reciprocal.pod | 2 +- doc/crypto/BN_num_bytes.pod | 2 +- doc/crypto/BN_rand.pod | 4 +-- doc/crypto/BN_set_bit.pod | 2 +- doc/crypto/DH_generate_key.pod | 2 +- doc/crypto/DH_generate_parameters.pod | 2 +- doc/crypto/DH_set_method.pod | 2 +- doc/crypto/DH_size.pod | 2 +- doc/crypto/DSA_do_sign.pod | 2 +- doc/crypto/DSA_dup_DH.pod | 2 +- doc/crypto/DSA_generate_key.pod | 2 +- doc/crypto/DSA_generate_parameters.pod | 2 +- doc/crypto/DSA_set_method.pod | 2 +- doc/crypto/DSA_size.pod | 2 +- doc/crypto/ERR_get_error.pod | 2 +- doc/crypto/ERR_load_crypto_strings.pod | 2 +- doc/crypto/ERR_load_strings.pod | 2 +- doc/crypto/ERR_put_error.pod | 2 +- doc/crypto/ERR_remove_state.pod | 2 +- doc/crypto/EVP_DigestInit.pod | 5 ++-- doc/crypto/EVP_EncryptInit.pod | 31 +++++++++++++-------- doc/crypto/OPENSSL_VERSION_NUMBER.pod | 2 +- doc/crypto/RAND_add.pod | 2 +- doc/crypto/RAND_bytes.pod | 2 +- doc/crypto/RAND_egd.pod | 2 +- doc/crypto/RAND_set_rand_method.pod | 2 +- doc/crypto/RSA_blinding_on.pod | 2 +- doc/crypto/RSA_check_key.pod | 2 +- doc/crypto/RSA_generate_key.pod | 2 +- doc/crypto/RSA_padding_add_PKCS1_type_1.pod | 2 +- doc/crypto/RSA_print.pod | 2 +- doc/crypto/RSA_private_encrypt.pod | 6 ++-- doc/crypto/RSA_set_method.pod | 2 +- doc/crypto/RSA_size.pod | 2 +- doc/crypto/blowfish.pod | 19 +++++++------ doc/crypto/bn.pod | 14 +++++----- doc/crypto/buffer.pod | 2 +- doc/crypto/des_modes.pod | 2 +- doc/crypto/err.pod | 2 +- doc/crypto/lhash.pod | 2 +- doc/crypto/md5.pod | 4 +-- doc/crypto/rand.pod | 2 +- doc/crypto/rc4.pod | 3 ++ doc/crypto/ripemd.pod | 2 +- doc/crypto/sha.pod | 4 +-- doc/crypto/threads.pod | 4 +-- ssl/ssl_lib.c | 2 ++ 55 files changed, 104 insertions(+), 87 deletions(-) diff --git a/INSTALL b/INSTALL index 3eaaeae554..c4105f96fc 100644 --- a/INSTALL +++ b/INSTALL @@ -117,8 +117,7 @@ If "make" fails, please report the problem to (note that your message will be forwarded to a public mailing list). - Include the output of "./config -t" and the OpenSSL version - number in your message. + Include the output of "make report" in your message. [If you encounter assembler error messages, try the "no-asm" configuration option as an immediate fix.] @@ -133,7 +132,7 @@ If a test fails, try removing any compiler optimization flags from the CFLAGS line in Makefile.ssl and run "make clean; make". Please send a bug report to , including the - output of "openssl version -a" and of the failed test. + output of "make report". 4. If everything tests ok, install OpenSSL with diff --git a/NEWS b/NEWS index 537cee624a..a2084af8e6 100644 --- a/NEWS +++ b/NEWS @@ -35,8 +35,9 @@ o Memory leak detection now allows applications to add extra information via a per-thread stack o PRNG robustness improved + o EGD support o BIGNUM library bug fixes - o faster DSA parameter generation + o Faster DSA parameter generation o Enhanced support for Alpha Linux o Experimental MacOS support diff --git a/doc/apps/version.pod b/doc/apps/version.pod index 69421d52cb..5d261a6405 100644 --- a/doc/apps/version.pod +++ b/doc/apps/version.pod @@ -2,7 +2,7 @@ =head1 NAME -version - print version information +version - print OpenSSL version information =head1 SYNOPSIS diff --git a/doc/crypto/BN_add.pod b/doc/crypto/BN_add.pod index e4230851e4..0541d45643 100644 --- a/doc/crypto/BN_add.pod +++ b/doc/crypto/BN_add.pod @@ -3,7 +3,7 @@ =head1 NAME BN_add, BN_sub, BN_mul, BN_div, BN_sqr, BN_mod, BN_mod_mul, BN_exp, -BN_mod_exp, BN_gcd - Arithmetic operations on BIGNUMs +BN_mod_exp, BN_gcd - arithmetic operations on BIGNUMs =head1 SYNOPSIS diff --git a/doc/crypto/BN_add_word.pod b/doc/crypto/BN_add_word.pod index 1c3c629f7f..66bedfb924 100644 --- a/doc/crypto/BN_add_word.pod +++ b/doc/crypto/BN_add_word.pod @@ -2,7 +2,7 @@ =head1 NAME -BN_add_word, BN_sub_word, BN_mul_word, BN_div_word, BN_mod_word - Arithmetic +BN_add_word, BN_sub_word, BN_mul_word, BN_div_word, BN_mod_word - arithmetic functions on BIGNUMs with integers =head1 SYNOPSIS diff --git a/doc/crypto/BN_bn2bin.pod b/doc/crypto/BN_bn2bin.pod index 6bf5f34822..05f9e628cc 100644 --- a/doc/crypto/BN_bn2bin.pod +++ b/doc/crypto/BN_bn2bin.pod @@ -3,7 +3,7 @@ =head1 NAME BN_bn2bin, BN_bin2bn, BN_bn2hex, BN_bn2dec, BN_hex2bn, BN_dec2bn, -BN_print, BN_print_fp, BN_bn2mpi, BN_mpi2bn - Format conversions +BN_print, BN_print_fp, BN_bn2mpi, BN_mpi2bn - format conversions =head1 SYNOPSIS diff --git a/doc/crypto/BN_generate_prime.pod b/doc/crypto/BN_generate_prime.pod index bf6290ab9a..638f6514ee 100644 --- a/doc/crypto/BN_generate_prime.pod +++ b/doc/crypto/BN_generate_prime.pod @@ -2,7 +2,7 @@ =head1 NAME -BN_generate_prime, BN_is_prime, BN_is_prime_fasttest - Generate primes and test for primality +BN_generate_prime, BN_is_prime, BN_is_prime_fasttest - generate primes and test for primality =head1 SYNOPSIS diff --git a/doc/crypto/BN_mod_inverse.pod b/doc/crypto/BN_mod_inverse.pod index 9f3889f8a6..49e62daf9f 100644 --- a/doc/crypto/BN_mod_inverse.pod +++ b/doc/crypto/BN_mod_inverse.pod @@ -2,13 +2,14 @@ =head1 NAME -BN_mod_inverse - Compute inverse modulo n +BN_mod_inverse - compute inverse modulo n =head1 SYNOPSIS #include - BIGNUM *BN_mod_inverse(BIGNUM *r, BIGNUM *a, const BIGNUM *n, BN_CTX *ctx); + BIGNUM *BN_mod_inverse(BIGNUM *r, BIGNUM *a, const BIGNUM *n, + BN_CTX *ctx); =head1 DESCRIPTION diff --git a/doc/crypto/BN_mod_mul_reciprocal.pod b/doc/crypto/BN_mod_mul_reciprocal.pod index 42a3c0db7e..32432ce4e6 100644 --- a/doc/crypto/BN_mod_mul_reciprocal.pod +++ b/doc/crypto/BN_mod_mul_reciprocal.pod @@ -3,7 +3,7 @@ =head1 NAME BN_mod_mul_reciprocal, BN_RECP_CTX_new, BN_RECP_CTX_init, -BN_RECP_CTX_free, BN_RECP_CTX_set - Modular multiplication using +BN_RECP_CTX_free, BN_RECP_CTX_set - modular multiplication using reciprocal =head1 SYNOPSIS diff --git a/doc/crypto/BN_num_bytes.pod b/doc/crypto/BN_num_bytes.pod index ec04eb1fe1..61589fb9ac 100644 --- a/doc/crypto/BN_num_bytes.pod +++ b/doc/crypto/BN_num_bytes.pod @@ -2,7 +2,7 @@ =head1 NAME -BN_num_bits, BN_num_bytes, BN_num_bits_word - Get BIGNUM size +BN_num_bits, BN_num_bytes, BN_num_bits_word - get BIGNUM size =head1 SYNOPSIS diff --git a/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod index f090df6908..33363c981f 100644 --- a/doc/crypto/BN_rand.pod +++ b/doc/crypto/BN_rand.pod @@ -2,7 +2,7 @@ =head1 NAME -BN_rand, BN_pseudo_rand - Generate pseudo-random number +BN_rand, BN_pseudo_rand - generate pseudo-random number =head1 SYNOPSIS @@ -10,7 +10,7 @@ BN_rand, BN_pseudo_rand - Generate pseudo-random number int BN_rand(BIGNUM *rnd, int bits, int top, int bottom); - int BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom); + int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom); =head1 DESCRIPTION diff --git a/doc/crypto/BN_set_bit.pod b/doc/crypto/BN_set_bit.pod index 4b7aa2aa1a..b7c47b9b01 100644 --- a/doc/crypto/BN_set_bit.pod +++ b/doc/crypto/BN_set_bit.pod @@ -3,7 +3,7 @@ =head1 NAME BN_set_bit, BN_clear_bit, BN_is_bit_set, BN_mask_bits, BN_lshift, -BN_lshift1, BN_rshift, BN_rshift1 - Bit operations on BIGNUMs +BN_lshift1, BN_rshift, BN_rshift1 - bit operations on BIGNUMs =head1 SYNOPSIS diff --git a/doc/crypto/DH_generate_key.pod b/doc/crypto/DH_generate_key.pod index 6b612b6d1a..920995b2e5 100644 --- a/doc/crypto/DH_generate_key.pod +++ b/doc/crypto/DH_generate_key.pod @@ -2,7 +2,7 @@ =head1 NAME -DH_generate_key, DH_compute_key - Perform Diffie-Hellman key exchange +DH_generate_key, DH_compute_key - perform Diffie-Hellman key exchange =head1 SYNOPSIS diff --git a/doc/crypto/DH_generate_parameters.pod b/doc/crypto/DH_generate_parameters.pod index 8102e536f3..a7d0c75f0c 100644 --- a/doc/crypto/DH_generate_parameters.pod +++ b/doc/crypto/DH_generate_parameters.pod @@ -2,7 +2,7 @@ =head1 NAME -DH_generate_parameters, DH_check - Generate and check Diffie-Hellman parameters +DH_generate_parameters, DH_check - generate and check Diffie-Hellman parameters =head1 SYNOPSIS diff --git a/doc/crypto/DH_set_method.pod b/doc/crypto/DH_set_method.pod index 50254a9bd3..dca41d8dbc 100644 --- a/doc/crypto/DH_set_method.pod +++ b/doc/crypto/DH_set_method.pod @@ -3,7 +3,7 @@ =head1 NAME DH_set_default_method, DH_get_default_method, DH_set_method, -DH_new_method, DH_OpenSSL - Select RSA method +DH_new_method, DH_OpenSSL - select DH method =head1 SYNOPSIS diff --git a/doc/crypto/DH_size.pod b/doc/crypto/DH_size.pod index 40f89d65bb..97f26fda78 100644 --- a/doc/crypto/DH_size.pod +++ b/doc/crypto/DH_size.pod @@ -2,7 +2,7 @@ =head1 NAME -DH_size - Get Diffie-Hellman prime size +DH_size - get Diffie-Hellman prime size =head1 SYNOPSIS diff --git a/doc/crypto/DSA_do_sign.pod b/doc/crypto/DSA_do_sign.pod index a452888413..a24fd5714e 100644 --- a/doc/crypto/DSA_do_sign.pod +++ b/doc/crypto/DSA_do_sign.pod @@ -2,7 +2,7 @@ =head1 NAME -DSA_do_sign, DSA_do_verify - Raw DSA signature operations +DSA_do_sign, DSA_do_verify - raw DSA signature operations =head1 SYNOPSIS diff --git a/doc/crypto/DSA_dup_DH.pod b/doc/crypto/DSA_dup_DH.pod index e3b6c9e61b..29cb1075d1 100644 --- a/doc/crypto/DSA_dup_DH.pod +++ b/doc/crypto/DSA_dup_DH.pod @@ -2,7 +2,7 @@ =head1 NAME -DSA_dup_DH - Create a DH structure out of DSA structure +DSA_dup_DH - create a DH structure out of DSA structure =head1 SYNOPSIS diff --git a/doc/crypto/DSA_generate_key.pod b/doc/crypto/DSA_generate_key.pod index e253501ef2..52890db5be 100644 --- a/doc/crypto/DSA_generate_key.pod +++ b/doc/crypto/DSA_generate_key.pod @@ -2,7 +2,7 @@ =head1 NAME -DSA_generate_key - Generate DSA key pair +DSA_generate_key - generate DSA key pair =head1 SYNOPSIS diff --git a/doc/crypto/DSA_generate_parameters.pod b/doc/crypto/DSA_generate_parameters.pod index c6c0ee374f..43f60b0eb9 100644 --- a/doc/crypto/DSA_generate_parameters.pod +++ b/doc/crypto/DSA_generate_parameters.pod @@ -2,7 +2,7 @@ =head1 NAME -DSA_generate_parameters - Generate DSA parameters +DSA_generate_parameters - generate DSA parameters =head1 SYNOPSIS diff --git a/doc/crypto/DSA_set_method.pod b/doc/crypto/DSA_set_method.pod index 94b4d4c631..0b13ec9237 100644 --- a/doc/crypto/DSA_set_method.pod +++ b/doc/crypto/DSA_set_method.pod @@ -3,7 +3,7 @@ =head1 NAME DSA_set_default_method, DSA_get_default_method, DSA_set_method, -DSA_new_method, DSA_OpenSSL - Select RSA method +DSA_new_method, DSA_OpenSSL - select RSA method =head1 SYNOPSIS diff --git a/doc/crypto/DSA_size.pod b/doc/crypto/DSA_size.pod index 551d1e25ab..23b6320a4d 100644 --- a/doc/crypto/DSA_size.pod +++ b/doc/crypto/DSA_size.pod @@ -2,7 +2,7 @@ =head1 NAME -DSA_size - Get DSA signature size +DSA_size - get DSA signature size =head1 SYNOPSIS diff --git a/doc/crypto/ERR_get_error.pod b/doc/crypto/ERR_get_error.pod index 37259bfda1..75ece00d97 100644 --- a/doc/crypto/ERR_get_error.pod +++ b/doc/crypto/ERR_get_error.pod @@ -2,7 +2,7 @@ =head1 NAME -ERR_get_error, ERR_peek_error - Obtain error code +ERR_get_error, ERR_peek_error - obtain error code =head1 SYNOPSIS diff --git a/doc/crypto/ERR_load_crypto_strings.pod b/doc/crypto/ERR_load_crypto_strings.pod index 25f7b20680..9bdec75a46 100644 --- a/doc/crypto/ERR_load_crypto_strings.pod +++ b/doc/crypto/ERR_load_crypto_strings.pod @@ -3,7 +3,7 @@ =head1 NAME ERR_load_crypto_strings, SSL_load_error_strings, ERR_free_strings - -Load and free error strings +load and free error strings =head1 SYNOPSIS diff --git a/doc/crypto/ERR_load_strings.pod b/doc/crypto/ERR_load_strings.pod index 82c8e9c00e..5acdd0edbc 100644 --- a/doc/crypto/ERR_load_strings.pod +++ b/doc/crypto/ERR_load_strings.pod @@ -2,7 +2,7 @@ =head1 NAME -ERR_load_strings, ERR_PACK, ERR_get_next_error_library - Load +ERR_load_strings, ERR_PACK, ERR_get_next_error_library - load arbitrary error strings =head1 SYNOPSIS diff --git a/doc/crypto/ERR_put_error.pod b/doc/crypto/ERR_put_error.pod index b1cbbf026b..acd241fbe4 100644 --- a/doc/crypto/ERR_put_error.pod +++ b/doc/crypto/ERR_put_error.pod @@ -2,7 +2,7 @@ =head1 NAME -ERR_put_error, ERR_add_error_data - Record an error +ERR_put_error, ERR_add_error_data - record an error =head1 SYNOPSIS diff --git a/doc/crypto/ERR_remove_state.pod b/doc/crypto/ERR_remove_state.pod index cf7981e907..ebcdc0f5a5 100644 --- a/doc/crypto/ERR_remove_state.pod +++ b/doc/crypto/ERR_remove_state.pod @@ -2,7 +2,7 @@ =head1 NAME -ERR_remove_state - Free a thread's error queue +ERR_remove_state - free a thread's error queue =head1 SYNOPSIS diff --git a/doc/crypto/EVP_DigestInit.pod b/doc/crypto/EVP_DigestInit.pod index 9b62059063..345b1ddfa7 100644 --- a/doc/crypto/EVP_DigestInit.pod +++ b/doc/crypto/EVP_DigestInit.pod @@ -9,8 +9,9 @@ EVP_DigestInit, EVP_DigestUpdate, EVP_DigestFinal - EVP digest routines #include void EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type); - void EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d, unsigned int cnt); - void EVP_DigestFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s); + void EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt); + void EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, + unsigned int *s); #define EVP_MAX_MD_SIZE (16+20) /* The SSLv3 md5+sha1 type */ diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod index 9400a025db..77ed4ccdba 100644 --- a/doc/crypto/EVP_EncryptInit.pod +++ b/doc/crypto/EVP_EncryptInit.pod @@ -8,17 +8,26 @@ EVP_EncryptInit, EVP_EncryptUpdate, EVP_EncryptFinal - EVP cipher routines #include - void EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, unsigned char *key, unsigned char *iv); - void EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, unsigned char *in, int inl); - void EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); - - void EVP_DecryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, unsigned char *key, unsigned char *iv); - void EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, unsigned char *in, int inl); - int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl); - - void EVP_CipherInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, unsigned char *key,unsigned char *iv,int enc); - void EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, unsigned char *in, int inl); - int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl); + void EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, + unsigned char *key, unsigned char *iv); + void EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, + int *outl, unsigned char *in, int inl); + void EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, + int *outl); + + void EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, + unsigned char *key, unsigned char *iv); + void EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, + int *outl, unsigned char *in, int inl); + int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, + int *outl); + + void EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, + unsigned char *key, unsigned char *iv, int enc); + void EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, + int *outl, unsigned char *in, int inl); + int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, + int *outl); void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a); diff --git a/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/doc/crypto/OPENSSL_VERSION_NUMBER.pod index c8d9e86830..b0b1058d19 100644 --- a/doc/crypto/OPENSSL_VERSION_NUMBER.pod +++ b/doc/crypto/OPENSSL_VERSION_NUMBER.pod @@ -2,7 +2,7 @@ =head1 NAME -OPENSSL_VERSION_NUMBER, SSLeay - Get OpenSSL version number +OPENSSL_VERSION_NUMBER, SSLeay - get OpenSSL version number =head1 SYNOPSIS diff --git a/doc/crypto/RAND_add.pod b/doc/crypto/RAND_add.pod index d6804e2a90..a3a2113cac 100644 --- a/doc/crypto/RAND_add.pod +++ b/doc/crypto/RAND_add.pod @@ -2,7 +2,7 @@ =head1 NAME -RAND_add, RAND_seed, RAND_screen - Add entropy to the PRNG +RAND_add, RAND_seed, RAND_screen - add entropy to the PRNG =head1 SYNOPSIS diff --git a/doc/crypto/RAND_bytes.pod b/doc/crypto/RAND_bytes.pod index ec874f1216..b6ebd50527 100644 --- a/doc/crypto/RAND_bytes.pod +++ b/doc/crypto/RAND_bytes.pod @@ -2,7 +2,7 @@ =head1 NAME -RAND_bytes, RAND_pseudo_bytes - Generate random data +RAND_bytes, RAND_pseudo_bytes - generate random data =head1 SYNOPSIS diff --git a/doc/crypto/RAND_egd.pod b/doc/crypto/RAND_egd.pod index 6f95a36926..2f4ff2b006 100644 --- a/doc/crypto/RAND_egd.pod +++ b/doc/crypto/RAND_egd.pod @@ -2,7 +2,7 @@ =head1 NAME -RAND_egd - Query entropy gathering daemon +RAND_egd - query entropy gathering daemon =head1 SYNOPSIS diff --git a/doc/crypto/RAND_set_rand_method.pod b/doc/crypto/RAND_set_rand_method.pod index 0e3e3d728a..466e9b8767 100644 --- a/doc/crypto/RAND_set_rand_method.pod +++ b/doc/crypto/RAND_set_rand_method.pod @@ -2,7 +2,7 @@ =head1 NAME -RAND_set_rand_method, RAND_get_rand_method, RAND_SSLeay - Select RAND method +RAND_set_rand_method, RAND_get_rand_method, RAND_SSLeay - select RAND method =head1 SYNOPSIS diff --git a/doc/crypto/RSA_blinding_on.pod b/doc/crypto/RSA_blinding_on.pod index 7879cccd07..fd2c69abd8 100644 --- a/doc/crypto/RSA_blinding_on.pod +++ b/doc/crypto/RSA_blinding_on.pod @@ -2,7 +2,7 @@ =head1 NAME -RSA_blinding_on, RSA_blinding_off - Protect the RSA operation from timing attacks +RSA_blinding_on, RSA_blinding_off - protect the RSA operation from timing attacks =head1 SYNOPSIS diff --git a/doc/crypto/RSA_check_key.pod b/doc/crypto/RSA_check_key.pod index f7af5e3647..79fed753ad 100644 --- a/doc/crypto/RSA_check_key.pod +++ b/doc/crypto/RSA_check_key.pod @@ -2,7 +2,7 @@ =head1 NAME -RSA_check_key - Validate RSA keys +RSA_check_key - validate private RSA keys =head1 SYNOPSIS diff --git a/doc/crypto/RSA_generate_key.pod b/doc/crypto/RSA_generate_key.pod index 816f1f7555..fdaddbcb13 100644 --- a/doc/crypto/RSA_generate_key.pod +++ b/doc/crypto/RSA_generate_key.pod @@ -2,7 +2,7 @@ =head1 NAME -RSA_generate_key - Generate RSA key pair +RSA_generate_key - generate RSA key pair =head1 SYNOPSIS diff --git a/doc/crypto/RSA_padding_add_PKCS1_type_1.pod b/doc/crypto/RSA_padding_add_PKCS1_type_1.pod index 24aca7eb1b..b8f678fe72 100644 --- a/doc/crypto/RSA_padding_add_PKCS1_type_1.pod +++ b/doc/crypto/RSA_padding_add_PKCS1_type_1.pod @@ -6,7 +6,7 @@ RSA_padding_add_PKCS1_type_1, RSA_padding_check_PKCS1_type_1, RSA_padding_add_PKCS1_type_2, RSA_padding_check_PKCS1_type_2, RSA_padding_add_PKCS1_OAEP, RSA_padding_check_PKCS1_OAEP, RSA_padding_add_SSLv23, RSA_padding_check_SSLv23, -RSA_padding_add_none, RSA_padding_check_none - Asymmetric encryption +RSA_padding_add_none, RSA_padding_check_none - asymmetric encryption padding =head1 SYNOPSIS diff --git a/doc/crypto/RSA_print.pod b/doc/crypto/RSA_print.pod index ee4ed2a993..dd968a5274 100644 --- a/doc/crypto/RSA_print.pod +++ b/doc/crypto/RSA_print.pod @@ -2,7 +2,7 @@ =head1 NAME -RSA_print, RSA_print_fp, DHparams_print, DHparams_print_fp - Print +RSA_print, RSA_print_fp, DHparams_print, DHparams_print_fp - print cryptographic parameters =head1 SYNOPSIS diff --git a/doc/crypto/RSA_private_encrypt.pod b/doc/crypto/RSA_private_encrypt.pod index ef5f9205bb..6861a98a10 100644 --- a/doc/crypto/RSA_private_encrypt.pod +++ b/doc/crypto/RSA_private_encrypt.pod @@ -2,17 +2,17 @@ =head1 NAME -RSA_private_encrypt, RSA_public_decrypt - Low level signature operations +RSA_private_encrypt, RSA_public_decrypt - low level signature operations =head1 SYNOPSIS #include int RSA_private_encrypt(int flen, unsigned char *from, - unsigned char *to, RSA *rsa,int padding); + unsigned char *to, RSA *rsa, int padding); int RSA_public_decrypt(int flen, unsigned char *from, - unsigned char *to, RSA *rsa,int padding); + unsigned char *to, RSA *rsa, int padding); =head1 DESCRIPTION diff --git a/doc/crypto/RSA_set_method.pod b/doc/crypto/RSA_set_method.pod index 07de65f0df..deb1183a23 100644 --- a/doc/crypto/RSA_set_method.pod +++ b/doc/crypto/RSA_set_method.pod @@ -4,7 +4,7 @@ RSA_set_default_method, RSA_get_default_method, RSA_set_method, RSA_get_method, RSA_PKCS1_SSLeay, RSA_PKCS1_RSAref, -RSA_PKCS1_null_method, RSA_flags, RSA_new_method - Select RSA method +RSA_PKCS1_null_method, RSA_flags, RSA_new_method - select RSA method =head1 SYNOPSIS diff --git a/doc/crypto/RSA_size.pod b/doc/crypto/RSA_size.pod index f88ee8b491..b36b4d58d5 100644 --- a/doc/crypto/RSA_size.pod +++ b/doc/crypto/RSA_size.pod @@ -2,7 +2,7 @@ =head1 NAME -RSA_size - Get RSA modulus size +RSA_size - get RSA modulus size =head1 SYNOPSIS diff --git a/doc/crypto/blowfish.pod b/doc/crypto/blowfish.pod index 962ba24bf8..80cb44edba 100644 --- a/doc/crypto/blowfish.pod +++ b/doc/crypto/blowfish.pod @@ -14,14 +14,15 @@ BF_cfb64_encrypt, BF_ofb64_encrypt, BF_options - Blowfish encryption void BF_encrypt(BF_LONG *data,const BF_KEY *key); void BF_decrypt(BF_LONG *data,const BF_KEY *key); - void BF_ecb_encrypt(const unsigned char *in,unsigned char *out,BF_KEY *key, - int enc); - void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, - BF_KEY *schedule, unsigned char *ivec, int enc); - void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, - BF_KEY *schedule, unsigned char *ivec, int *num, int enc); - void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, - BF_KEY *schedule, unsigned char *ivec, int *num); + void BF_ecb_encrypt(const unsigned char *in, unsigned char *out, + BF_KEY *key, int enc); + void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, + long length, BF_KEY *schedule, unsigned char *ivec, int enc); + void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, + long length, BF_KEY *schedule, unsigned char *ivec, int *num, + int enc); + void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, + long length, BF_KEY *schedule, unsigned char *ivec, int *num); const char *BF_options(void); =head1 DESCRIPTION @@ -89,7 +90,7 @@ None of the functions presented here return any value. =head1 NOTE -Applications should use the higher level functions EVP_DigestInit(3) etc. +Applications should use the higher level functions EVP_EncryptInit(3) etc. instead of calling the blowfish functions directly. =head1 SEE ALSO diff --git a/doc/crypto/bn.pod b/doc/crypto/bn.pod index c1cb2f61fd..ea09c79dd9 100644 --- a/doc/crypto/bn.pod +++ b/doc/crypto/bn.pod @@ -2,7 +2,7 @@ =head1 NAME -bn - Multiprecision integer arithmetics +bn - multiprecision integer arithmetics =head1 SYNOPSIS @@ -58,13 +58,13 @@ bn - Multiprecision integer arithmetics int BN_set_word(BIGNUM *a, unsigned long w); unsigned long BN_get_word(BIGNUM *a); - int BN_rand(BIGNUM *rnd, int bits, int top,int bottom); - int BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom); + int BN_rand(BIGNUM *rnd, int bits, int top, int bottom); + int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom); - BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,BIGNUM *add, - BIGNUM *rem,void (*callback)(int,int,void *),void *cb_arg); - int BN_is_prime(const BIGNUM *p,int nchecks,void (*callback)(int,int,void *), - BN_CTX *ctx,void *cb_arg); + BIGNUM *BN_generate_prime(BIGNUM *ret, int bits,int safe, BIGNUM *add, + BIGNUM *rem, void (*callback)(int, int, void *), void *cb_arg); + int BN_is_prime(const BIGNUM *p, int nchecks, + void (*callback)(int, int, void *), BN_CTX *ctx, void *cb_arg); int BN_set_bit(BIGNUM *a, int n); int BN_clear_bit(BIGNUM *a, int n); diff --git a/doc/crypto/buffer.pod b/doc/crypto/buffer.pod index dda8e7b508..7088f51bc4 100644 --- a/doc/crypto/buffer.pod +++ b/doc/crypto/buffer.pod @@ -2,7 +2,7 @@ =head1 NAME -BUF_MEM_new, BUF_MEM_free, BUF_MEM_grow, BUF_strdup - Simple +BUF_MEM_new, BUF_MEM_free, BUF_MEM_grow, BUF_strdup - simple character arrays structure =head1 SYNOPSIS diff --git a/doc/crypto/des_modes.pod b/doc/crypto/des_modes.pod index 6c0c2bff5b..d8148c86fc 100644 --- a/doc/crypto/des_modes.pod +++ b/doc/crypto/des_modes.pod @@ -2,7 +2,7 @@ =head1 NAME -Modes of DES - The variants of DES and other crypto algorithms of OpenSSL +Modes of DES - the variants of DES and other crypto algorithms of OpenSSL =head1 DESCRIPTION diff --git a/doc/crypto/err.pod b/doc/crypto/err.pod index a74b4eeb41..b824c92b57 100644 --- a/doc/crypto/err.pod +++ b/doc/crypto/err.pod @@ -2,7 +2,7 @@ =head1 NAME -err - Error codes +err - error codes =head1 SYNOPSIS diff --git a/doc/crypto/lhash.pod b/doc/crypto/lhash.pod index 55e7493238..af2c9a7102 100644 --- a/doc/crypto/lhash.pod +++ b/doc/crypto/lhash.pod @@ -3,7 +3,7 @@ =head1 NAME lh_new, lh_free, lh_insert, lh_delete, lh_retrieve, lh_doall, -lh_doall_arg, lh_error - Dynamic hash table +lh_doall_arg, lh_error - dynamic hash table =head1 SYNOPSIS diff --git a/doc/crypto/md5.pod b/doc/crypto/md5.pod index c8b141b854..2b084878cd 100644 --- a/doc/crypto/md5.pod +++ b/doc/crypto/md5.pod @@ -51,8 +51,8 @@ for MD2_DIGEST_LENGTH == 16 bytes of output, and erases the B. MD5_Init(), MD5_Update() and MD5_Final() are analogous using an B structure. -Applications should use the higher level functions EVP_DigestInit(3) etc. -instead of calling the hash functions directly. +Applications should use the higher level functions EVP_DigestInit(3) +etc. instead of calling the hash functions directly. =head1 NOTE diff --git a/doc/crypto/rand.pod b/doc/crypto/rand.pod index 5104b070a1..295b681050 100644 --- a/doc/crypto/rand.pod +++ b/doc/crypto/rand.pod @@ -2,7 +2,7 @@ =head1 NAME -rand - Pseudo-random number generator +rand - pseudo-random number generator =head1 SYNOPSIS diff --git a/doc/crypto/rc4.pod b/doc/crypto/rc4.pod index e380045dbf..aaab850afd 100644 --- a/doc/crypto/rc4.pod +++ b/doc/crypto/rc4.pod @@ -37,6 +37,9 @@ Since RC4 is a stream cipher (the input is XORed with a pseudo-random key stream to produce the output), decryption uses the same function calls as encryption. +Applications should use the higher level functions EVP_EncryptInit(3) +etc. instead of calling the RC4 functions directly. + =head1 RETURN VALUES RC4_set_key() and RC4() do not return values. diff --git a/doc/crypto/ripemd.pod b/doc/crypto/ripemd.pod index d6ad561598..9656bb0980 100644 --- a/doc/crypto/ripemd.pod +++ b/doc/crypto/ripemd.pod @@ -13,7 +13,7 @@ RIPEMD-160 hash function unsigned char *md); void RIPEMD160_Init(RIPEMD160_CTX *c); - void RIPEMD160_Update(RIPEMD_CTX *c, const unsigned char *data, + void RIPEMD160_Update(RIPEMD_CTX *c, const void *data, unsigned long len); void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c); diff --git a/doc/crypto/sha.pod b/doc/crypto/sha.pod index ecfba75395..57b0fb6da4 100644 --- a/doc/crypto/sha.pod +++ b/doc/crypto/sha.pod @@ -37,8 +37,8 @@ be hashed (B bytes at B). SHA1_Final() places the message digest in B, which must have space for SHA_DIGEST_LENGTH == 20 bytes of output, and erases the B. -Applications should use the higher level functions EVP_DigestInit(3) etc. -instead of calling the hash functions directly. +Applications should use the higher level functions EVP_DigestInit(3) +etc. instead of calling the hash functions directly. The predecessor of SHA-1, SHA, is also implemented, but it should be used only when backward compatibility is required. diff --git a/doc/crypto/threads.pod b/doc/crypto/threads.pod index 651694bd9f..5f351a166a 100644 --- a/doc/crypto/threads.pod +++ b/doc/crypto/threads.pod @@ -20,12 +20,12 @@ CRYPTO_set_locking_callback, CRYPTO_set_id_callback - OpenSSL thread support OpenSSL can safely be used in multi-threaded applications provided that two callback functions are set. -locking_function(int mode, int type, const char *file, int line) is +locking_function(int mode, int n, const char *file, int line) is needed to perform locking on shared data stuctures. Multi-threaded applications will crash at random if it is not set. locking_function() must be able to handle up to CRYPTO_num_locks() -different mutex locks. It sets the Bth lock if B & +different mutex locks. It sets the B-th lock if B & B, and releases it otherwise. B and B are the file number of the function setting the diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 3e52a8bce1..322685dd45 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -89,11 +89,13 @@ union rsa_fn_to_char_u }; #endif +#ifndef NO_DH union dh_fn_to_char_u { char *char_p; DH *(*fn_p)(SSL *, int, int); }; +#endif int SSL_clear(SSL *s) { -- 2.34.1